Merge origin/master

Conflicts:
	application/views/academic/Headerlogin.php
	application/views/registration/Headerlogin.php