Merge origin/master

Conflicts:
	views/js/custom/all_courses_script.php
Merge origin/master

Conflicts:
	views/js/custom/all_courses_script.php
Merge origin/master

Conflicts:
	models/functions/importGeneralFile.php