Merge origin/master

Conflicts:
	view/teacher/teacher_edit_profile.php