Merge origin/master

Conflicts:
	application/views/Department/applicant_detail.php
Merge origin/master