Merge branch 'master' into 'master'

interface/web/client/form/client.tform.php

interface/web/client/form/client_template.tform.php

interface/web/client/form/reseller.tform.php

interface/web/sites/form/web_vhost_domain.tform.php

interface/web/sites/templates/web_vhost_domain_edit.htm

server/conf/hhvm_starter.master

server/conf/nginx_vhost.conf.master

server/conf/vhost.conf.master

server/plugins-available/apache2_plugin.inc.php

server/plugins-available/nginx_plugin.inc.php