Merge origin/master

Conflicts:
	models/admin/update_student_details.php