Merge branch 'master' of http://git.ispconfig.org/ispconfig/ispconfig3

install/sql/incremental/upd_0080.sql

install/sql/ispconfig3.sql

install/tpl/server.ini.master

interface/lib/classes/validate_client.inc.php

interface/web/admin/form/server_config.tform.php

interface/web/admin/lib/lang/de_server_config.lng

interface/web/admin/lib/lang/en_server_config.lng

interface/web/admin/templates/server_config_web_edit.htm

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

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

interface/web/client/lib/lang/de_client.lng

interface/web/client/lib/lang/de_reseller.lng

interface/web/client/lib/lang/en_client.lng

interface/web/client/lib/lang/en_reseller.lng

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

interface/web/sites/lib/lang/de_web_vhost_domain.lng

interface/web/sites/lib/lang/en_web_vhost_domain.lng

interface/web/sites/templates/web_vhost_domain_advanced.htm

interface/web/sites/templates/web_vhost_domain_ssl.htm

interface/web/sites/web_vhost_domain_edit.php