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'
[admissions] add parameters on period/method change
Merge remote-tracking branch 'absolu7/develop' into develop
dummys for test
refactor admissions import button
refactor admissions import index to modal
delete admissions importer index unneeded file
adding period/method params to importer form
Merge branch 'develop' of github.com:kalkov/GAKUEngine into develop
Merge pull request #135 from kalkov/master

only one failure in admissions
adding period/method params to importer form v2
adding applicant number v1
fix admissions controller
removed unneeded admission js
Merge remote-tracking branch 'snowsunny/master' into develop