Merge branch 'develop' of git://github.com/kalkov/GAKUEngine into develop
fix conflict after pull
fix conflict after pull
Merge branch 'master' of git://github.com/Genshin/GAKUEngine into develop
merge
fix courses and class_groups student search
remove student_chooser js requirement
add nil check for admission period in view
add paging info in students index
add -none assigned- for class group in new student view
[models] validations
merge martakostova develop
[admissions] spec for change state and factories
[controller specs] wip admission controller
[drag&drop] ordering exam portion from exam show with d&d by y axes
[migration] add position to exam portion
Merge branch 'master' of git://github.com/Kagetsuki/GAKUEngine
fix admission spec
[exam portion] after delete last exam portion destroy exam
[migration] remove master exam portion logic and field