Merge origin/master into HEAD

Conflicts:
	views/scripts/dean/home.php
Merge origin/master
Merge origin/master

Conflicts:
	views/js/custom/all_courses_script.php