reformat code
Merge remote-tracking branch 'origin/master'

Conflicts:
	protected/messages/uk/studyPlan.php
	protected/messages/uk/terms.php
	protected/modules/studyPlan/views/hours/create.php
	protected/modules/studyPlan/views/main/index.php
	protected/modules/studyPlan/views/main/subjects.php
	protected/modules/studyPlan/views/plan/create.php
	protected/modules/studyPlan/views/plan/index.php
	protected/modules/studyPlan/views/plan/update.php
	protected/modules/studyPlan/views/semester/create.php
	protected/modules/studyPlan/views/subject/view.php