Master

See merge request !138

Conflicts:
	install/sql/ispconfig3.sql
	install/tpl/config.inc.php.master
	install/uninstall.php
	interface/lib/config.inc.php
	interface/web/themes/blue/ispconfig_version

Master

See merge request !135

Master

See merge request !134

Master fixes

Fixed problem that broke the updater (wrong name of variable)

See merge request !133

Fixed a Bug in Centos 7 were php-fpm uses sockets while mod_proxy_fcgi in centos 7 does not support that yet.

- Changed tform_actions.inc.php to always provide oldDataRecord array for updates even when dbhistory = off.

- Fixed: FS#3710 - Bug with PHP-FPM configuration since 3.0.5.4 Patch 4
- Fixed wrong function calls in system lib.

- Fixed a problem with restart of services due to the fact that Ubuntu has upstart and systemd installed, but only upstart is working without errors.

Conflicts:
	install/dist/lib/fedora.lib.php
	install/dist/lib/opensuse.lib.php

Master

See merge request !132

Conflicts:
	install/autoupdate.php
	install/install.php
	install/sql/incremental/upd_0078.sql
	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/classes/db_mysql.inc.php
	interface/lib/classes/remoting.inc.php
	interface/lib/classes/tform.inc.php
	interface/lib/classes/validate_reseller.inc.php
	interface/lib/config.inc.php
	interface/lib/lang/es.lng
	interface/web/admin/lib/lang/de_server_config.lng
	interface/web/admin/lib/lang/en_server_config.lng
	interface/web/admin/lib/lang/es_server_config.lng
	interface/web/admin/lib/lang/fr_server_config.lng
	interface/web/admin/lib/lang/hr_server_config.lng
	interface/web/dns/lib/lang/hr_dns_wizard.lng
	interface/web/mail/lib/lang/hr_mail_user.lng
	interface/web/mail/mail_domain_edit.php
	interface/web/mail/mail_user_edit.php
	interface/web/remote/i...