Merge branch 'develop' of github.com:tapalilov/GAKUEngine into develop
[migrations] fix association issue because of renaming school history to external school record
[admission specs] fix admissions controller spec failures for changing state
WIP admissions.xls
Merge remote-tracking branch 'kagetsuki/develop'
Merge remote-tracking branch 'kagetsuki/master'
Merge remote-tracking branch 'kagetsuki/master'
merge test
WIP admissions.xls
Merge remote-tracking branch 'kagetsuki/master'
WIP
WIP
WIP export admission.xls
[admissions] refactoring method and period logics
WIP export admission.xls
[wip] preset for showing and hide table fields in student chooser. will be incorporeted to table after chooser refactor
Merge remote-tracking branch 'tapalilov/develop'
Merge remote-tracking branch 'absolu7/develop'

Conflicts:
	admissions/app/controllers/gaku/admin/admissions_controller.rb