repair
Merge remote-tracking branch 'origin/master'

Conflicts:
	youCourse/protected/config/main.php
	youCourse/protected/controllers/VideoController.php