Merge origin/master

Conflicts:
	application/controllers/supervisor.php
	application/controllers/teaching.php
	application/views/academic/teaching_detail.php
	application/views/academic/teaching_replied.php
	application/views/academic/teaching_view.php