Conflicts:
	install/sql/incremental/upd_0073.sql

Conflicts:
	install/sql/incremental/upd_0073.sql
	install/sql/ispconfig3.sql

Conflicts:
	interface/lib/plugins/sites_web_vhost_subdomain_plugin.inc.php
	interface/web/mail/lib/lang/de_mail_get.lng
	interface/web/sites/lib/lang/de_cron.lng
	interface/web/sites/lib/lang/en_cron.lng
	interface/web/sites/web_vhost_subdomain_edit.php

- Enable php-fpm socket mode as default.

- changed/harmonized order of clients in client select fields ("ORDER BY client.company_name, client.contact_name, sys_group.name")

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

Conflicts:
	install/sql/ispconfig3.sql
	install/tpl/config.inc.php.master
	interface/lib/config.inc.php
	interface/web/sites/lib/lang/cz_web_subdomain.lng
	interface/web/sites/lib/lang/cz_web_subdomain_list.lng
	interface/web/sites/lib/lang/cz_web_vhost_subdomain_list.lng
	server/cron_daily.php

- Updated version number to 3.0.5.4rc1

- mail accounts not locked when client locked
- mail account sending and receiving lock separated
- fixed error in query
- fixed wording to match separeted locks

Fixed a bug in Opensuse installer (permissions of squirrelmail files)
Fixed a issue in smtp-authentication on courier-imap systems when custom usernames are used.

Master

Use 60-dkim for the key-definitions on systems with seperated amavisd-configs like debian and ubuntu

Master

Use preg_match/preg_replace when adding/removing keys to amavis to avoid duplicate keys with different selectors. Prevent restarting amavis more then one time.