commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	protected/modules/studyPlan/models/Semester.php
Merge remote-tracking branch 'origin/master'
journal marks by group