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

install/sql/incremental/upd_0079.sql

install/sql/ispconfig3.sql

interface/lib/classes/plugin_directive_snippets.inc.php

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

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

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

interface/web/admin/templates/directive_snippets_edit.htm

interface/web/sites/ajax_get_json.php

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

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

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

interface/web/sites/templates/web_directive_snippets.htm

interface/web/sites/templates/web_vhost_domain_edit.htm

interface/web/sites/web_vhost_domain_edit.php

server/plugins-available/apache2_plugin.inc.php

server/plugins-available/nginx_plugin.inc.php