Merge origin/master

Conflicts:
	models/functions/databaseClass.php
Merge origin/master