Merge pull request #135 from kalkov/master

only one failure in admissions
Merge branch 'master' of git://github.com/Kagetsuki/GAKUEngine into develop
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
adjusting nihon_kou_kou importer DO NOT PULL
Merge remote-tracking branch 'marta/develop'
updated translations
need adjustment in views
WIP
Merge remote-tracking branch 'snowsunny/master'
WIP
Merge branch 'master' of git://github.com/Kagetsuki/GAKUEngine into develop
add external_school_record foreign_key
[helpers] visualizing achievements and simple grades
[model] add to_s to simple grades
connect partial with achievements and simple grades