Added one more migration for unused tables
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge pull request #19 from elhowm/master

changes about students questionary
study plan document
Merge remote-tracking branch 'origin/master'
Students import v1
Merge remote-tracking branch 'origin/master'

Conflicts:
	protected/config/main.php
added migration for teacher field
Teacher short_name field fix
students import v0.2
work plan
Merge pull request #20 from elhowm/master

Study years
Merge remote-tracking branch 'origin/master'
study plan dual flag
Merge remote-tracking branch 'origin/master'
composer fix
composer.phar update
diploma and certificate subjects name in study plan edit_subject
fix