Merge origin/master
Merge origin/master

Conflicts:
	application/controllers/supervisor.php
	application/views/academic/Headerloginsuper.php