Merge origin/master

Conflicts:
	application/views/academic/project_view.php
	application/views/admin/Headerlogin.php