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:
	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

- Add missing configuration inclusion (vhost files) to apache config

Changed: apps vhost is now a template (for apache version)
Changed: template if tags can now be of format 'version' to make version comparisons (e.g. 2.12 > 2.2 !)
Changed: New apache 2.4 syntax for deny from all (-> Require all denied) etc.