Master

- Important for plugin files!

Merge of domains, vhost subdomains and vhost aliasdomains to vhost domains

Conflicts:
	interface/web/sites/web_aliasdomain_edit.php

Master

Merged aliasdomain and subdomain files for easier code maintenance

changed the regex; new line at the end is allowed - prevents problems when using cut&paste for the private-key in the interface

Conflicts:
	interface/web/sites/web_aliasdomain_edit.php

Conflicts:
	install/sql/incremental/upd_0063.sql

Conflicts:
	interface/lib/classes/remoting.inc.php
	interface/web/sites/web_domain_edit.php
	server/lib/classes/monitor_tools.inc.php
	server/plugins-available/maildeliver_plugin.inc.php