Merge origin/master

Conflicts:
	class/database.class.php
Merge origin/master
Merge origin/master
Merge origin/master

Conflicts:
	class/database.class.php