Merge origin/master

Conflicts:
	application/views/academic/supervisor_view.php
Merge origin/master