Merge branch 'master' into dev_up

Conflicts:
	install/install_1-0_mysql.sql
	install/install_1-0_postgresql.sql
	sources/Load.php
	sources/Logging.php
	sources/database/Db-mysql.class.php