Merge pull request #135 from kalkov/master

only one failure in admissions
adding applicant number v1
fix admissions controller
removed unneeded admission js
reset
WIP fix admissions importer
WIP FixAdmissionsImporter add kyoka
WIP FixAdmissionsImporter add kyoka
Merge remote-tracking branch 'kagetsuki/develop'
Merge branch 'master' of git://github.com/Kagetsuki/GAKUEngine into develop
fixing admission specs
fix AdmissionsImporter add 内申点登録
mini fix AdmissionsImporter 内申点登録
Merge remote-tracking branch 'snowsunny/master' into develop
[locales] add missing locales
[controller specs] add spec for change state
minor fixes
Merge branch 'master' of git://github.com/kalkov/GAKUEngine into develop
external school recrod view partial and locales
Merge remote-tracking branch 'kagetsuki/develop'