Merge origin/master, all bugs fixed in all courses script 

Conflicts:
	views/js/custom/all_courses_script.php
	views/scripts/dean/advise.php
	views/scripts/dean/all_courses.php