work day
Merge branch 'master' into study_plan

Conflicts:
	protected/migrations/m140208_146057_exemption.php
study plan document
study plan module