fix graph
Merge branch 'master' of https://github.com/ZAYEC77/Arina
Merge remote-tracking branch 'origin/master'

Conflicts:
	protected/modules/studyPlan/controllers/PlanController.php
subjects filter
curator module