merging
Merge origin/master

Conflicts:
	controller/course/CtrlCourseUpdate.php