Merge remote-tracking branch 'kagetsuki/develop'
WIP fix AdmissionsImporter
merged kagetsuki/master
Merge remote-tracking branch 'kagetsuki/develop'
mini change
Merge remote-tracking branch 'kagetsuki/develop'
Merge pull request #135 from kalkov/master

only one failure in admissions
Merge remote-tracking branch 'snowsunny/master' into develop
cleaned debug messages
reset
WIP fix admissions importer
added and adjusted models
WIP FixAdmissionsImporter add kyoka
WIP FixAdmissionsImporter add kyoka
Merge remote-tracking branch 'kagetsuki/develop'
let's call this "working" for now
Merge branch 'master' of git://github.com/Kagetsuki/GAKUEngine into develop
fix AdmissionsImporter add 内申点登録
mini fix AdmissionsImporter 内申点登録
Create links for ExternalSchoolRecord, add specs for paperclip