Merge origin/master

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