'&&' is the logical AND operator and will simply run the "killer" subshell if
the init.d script returned success. What is needed is '&' to run the init script
in the background, otherwise $! is unset too. The sleep needs to be longer
because some daemons like mysql with lots of dirty buffers can take a while to
stop and we don't want to abort that attempt too early.

add amavis-configfile-location for centos 6.4; add amavis-initscrip-name for centos 6.4; fixed missing private_key in mail/mail_domain_dkim_create.php

Changed query syntax of alias domain edit file
Changed deprecated syntax in alpha plesk importer

Conflicts:
	interface/lib/classes/tform.inc.php
	interface/web/admin/lib/lang/de_directive_snippets.lng
	interface/web/dns/dns_import.php
	interface/web/dns/dns_soa_edit.php
	interface/web/dns/dns_wizard.php
	interface/web/mail/mail_domain_edit.php
	interface/web/sites/database_edit.php
	interface/web/sites/lib/lang/de_web_domain.lng
	interface/web/sites/lib/lang/en_web_domain.lng
	interface/web/sites/web_domain_edit.php
	server/server.php

- nginx: added {DOCROOT} and {FASTCGIPASS} placeholders to directive snippets and nginx Directives fields.

display dns-record for dkim in the mail-domain
rewrite function domain_dkim_update in server/plugins-available/mail_plugin_dkim.inc.php
change dns*.php according to commit 604c0c24

Fixed output of action name in debug mode (registerAction)