fixes for admission specs
remove unnecessary spec for admissions controller
Merge branch 'develop' of github.com:kalkov/GAKUEngine into develop
[admission specs] add more controller specs and minor fixes
fix conflict after pull from absolu7
[admissions] refactor change student state method and change factory data
[admissions specs] add more specs for admission controller
Merge remote-tracking branch 'marta/develop' into develop
Merge remote-tracking branch 'tapalilov/develop' into develop
Merge branch 'develop' of github.com:Kagetsuki/GAKUEngine into develop
fixed wtf bug... maybe?
WIP admissions.xls
Merge remote-tracking branch 'kagetsuki/develop'
Merge remote-tracking branch 'kagetsuki/master'
first_or_create breaks EVERYTHING
Merge remote-tracking branch 'kagetsuki/master'