Merge branch 'master' of git://github.com/Kagetsuki/GAKUEngine into develop
Merge branch 'develop' of git://github.com/kalkov/GAKUEngine into develop
[refactor] admin/enrollment_statuses
change deleted fields to is_deleted
Merge branch 'develop' of github.com:kalkov/GAKUEngine into refactor_admissions
change is_deleted fields to boolean
[refacotr] enrollment status seed to use globalize3 for ja and en
change student scope var from 0 to false
Merge branch 'develop' of github.com:kalkov/GAKUEngine into refactor_admissions
[globalize3] add to enrollment status, seends and migration
[enrollment status] refactor enrollment status in students/view
Merge remote-tracking branch 'tapalilov/develop'

Conflicts:
	core/app/views/gaku/students/_show_table.html.slim
Merge remote-tracking branch 'absolu7/refactor_admissions'