Conflicts:
	interface/lib/classes/remoting.inc.php
	interface/web/dns/lib/lang/cz_dns_dkim.lng
	interface/web/mail/lib/lang/cz_mail_backup_list.lng
	interface/web/mail/lib/lang/cz_mail_user.lng
	interface/web/sites/lib/lang/cz_web_childdomain.lng
	interface/web/sites/lib/lang/cz_web_childdomain_list.lng
	interface/web/sites/lib/lang/cz_web_subdomain_list.lng
	interface/web/sites/lib/lang/cz_web_vhost_domain.lng
	interface/web/sites/lib/lang/cz_web_vhost_subdomain.lng
	interface/web/sites/web_vhost_domain_edit.php

Moved check_recipient_access to the front. Blacklist for recipients is ignored on outgoing mails via smtp auth otherwise.

Master

Remote Quota

Added functions to get Website and Mail-Quota via Remote-Api
Moved Quota-Calculation-Functions to own lib-File for usage from dashlets and Remote-Api
Added Parameters to select if quota should be given readable (+kB, +MB) or as raw data (via remote)

- Added function to detect the apache version to installer.
- Added support for apache 2.4 to vhots templates for ispconfig vhost and apps vhost in installer.

This reverts commit 4cd62d78.