Conflicts:
	install/dist/lib/fedora.lib.php
	install/dist/lib/opensuse.lib.php
	install/lib/installer_base.lib.php
	install/sql/ispconfig3.sql
	install/tpl/config.inc.php.master
	interface/lib/classes/aps_crawler.inc.php
	interface/lib/classes/auth.inc.php
	interface/lib/classes/plugin_backuplist.inc.php
	interface/lib/config.inc.php
	interface/lib/plugins/mail_user_filter_plugin.inc.php
	interface/web/login/password_reset.php
	interface/web/sites/templates/web_backup_list.htm
	interface/web/sites/webdav_user_edit.php
	interface/web/themes/blue/ispconfig_version
	server/plugins-available/backup_plugin.inc.php
	server/plugins-available/shelluser_base_plugin.inc.php