little lang fix
Merge remote-tracking branch 'origin/master'

Conflicts:
	protected/modules/studyPlan/controllers/MainController.php
little lang fix