Merge origin/master

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

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

Conflicts:
	style/img/up.png
	views/js/custom/all_courses_script.php