Merge branch 'master' into 'master'

interface/web/dns/dns_dkim_edit.php

interface/web/dns/dns_dkim_get.php

interface/web/dns/dns_wizard.php

interface/web/mail/mail_user_edit.php

interface/web/sites/database_edit.php

interface/web/sites/database_quota_stats.php

...rface/web/sites/lib/lang/en_database_quota_stats_list.lng

interface/web/sites/lib/module.conf.php

interface/web/sites/list/database_quota_stats.list.php

interface/web/sites/templates/database_quota_stats_list.htm

server/conf/mail/db_quota_notification_de.txt

server/conf/mail/db_quota_notification_en.txt

server/conf/mail/db_quota_ok_notification_de.txt

server/scripts/ispconfig_update.php