Merge branch 'master' into dev_up2

Conflicts:
	install/install_1-0_mysql.sql
	install/install_1-0_postgresql.sql
	sources/admin/ManageServer.controller.php
	sources/database/Db-mysql.class.php
	sources/database/Db-postgresql.class.php
	sources/subs/Admin.subs.php
	sources/subs/AdminDebug.subs.php
	sources/subs/Cache.subs.php
	themes/default/languages/english/ManageSettings.english.php
	themes/default/scripts/admin.js
Restore the previously deleted postgre-specific install file