Conflicts:
	install/sql/ispconfig3.sql
	install/tpl/config.inc.php.master
	interface/lib/classes/tform.inc.php
	interface/lib/config.inc.php
	interface/web/admin/server_config_edit.php
	interface/web/themes/blue/ispconfig_version
	interface/web/tools/import_plesk.php
	interface/web/tools/resync.php
	interface/web/vm/openvz_action.php

FS#3749 - Disable smtp checkbox in mailbox setting has no effect on courier servers

See merge request !199

FS#3900 - Invalid home dir for shell users. Changed description from -Dir- to -Base Dir- to refelect that /home/username is appaneded to this directory.

Master Fixes

See merge request !198

Stable 3.0.5 Fixes

See merge request !197

FS#1212 - IP Address in fetchmail - allow ipv4 or hostname for pop/imap-server

See merge request !196

Master

See merge request !195

Master

See merge request !194

postfix plugins should not corrupt "other" settings + fix

postfix plugins should not corrupt "other" settings - sysadmin, ...
fixes some misconfiguration under certain circonstances

See merge request !191

fixes also some misconfiguration under some circonstances