Merge branch 'master' of git://github.com/Kagetsuki/GAKUEngine into develop
refactor
Merge remote-tracking branch 'upstream/develop'
Merge branch 'develop' of git://github.com/kalkov/GAKUEngine into develop
over-parallelized?
added worker
Merge remote-tracking branch 'kalkov/develop'
Merge remote-tracking branch 'absolu7/refactor_admissions'
[refactor] admin/enrollment_statuses
Merge branch 'develop' of git://github.com/kalkov/GAKUEngine into develop
[admissions specs] minor fix
Merge branch 'refactor_admissions' of git://github.com/absolu7/GAKUEngine into develop
[refacotr] enrollment status seed to use globalize3 for ja and en
[globalize3] add to enrollment status, seends and migration
admission method phases flash on create
[admission specs] add spec for validating creating a student and other minor fixes
Merge branch 'develop' of git://github.com/kalkov/GAKUEngine into develop
Merge branch 'develop' of git://github.com/tapalilov/GAKUEngine into develop
[enrollment status] refactor enrollment status in students/view
pull tapalilov