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

Master

See merge request !186

This reverts commit 1357c3e3.

Prevent empty hostname during install

See merge request !184

'repeat password'-query if the default password is not used

See merge request !183

FS#2213 - Ask for admin password while installation

See merge request !182

changed if-else in installer to write configs for the latest version with force-…

…install (package not yet installed)

See merge request !181

changed if-else in installer to write configs for the latest version with force-install (package not yet installed)

Conflicts:
	install/sql/incremental/upd_dev_collection.sql

shows warning for missing services during install (and allows force-configure for missing / not detected services)

See merge request !180

shows warning for missing services during install (and allows force-configure for missing / not detected services)

added 'features' (like nfs:on) to openvz

See merge request !179