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.

Master

This will enable all functions, if previously disabled in php.ini, like exec which ispconfig needs to functions properly.

This will enable all functions, previously disabled in php.ini, like exec which ispconfig needs to functions properly.

Master Fixes

Added backup-functions to remote-API (FS#2832)

Updated apache_ispconfig.conf.master to allow access to phpmyadmin and squirrelmail on opensuse 13.1.

 @see commit 9a8de140

Bad french translation on SSL page

State was translated country

 - Reason:
   AddHandler fcgid-script .php
   does not only parse .php files, but all .php.* (e. g. .php.txt, .php.test etc.)

Master Fixes

problem with ServerAlias-Directives solved with usage of vhostalias and subdomainalias

Conflicts:
	install/sql/ispconfig3.sql
	install/tpl/config.inc.php.master
	install/tpl/debian_postfix.conf.master
	install/tpl/fedora_postfix.conf.master
	install/tpl/gentoo_postfix.conf.master
	install/tpl/opensuse_postfix.conf.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
	interface/web/themes/blue/ispconfig_version