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
[refacotr] enrollment status seed to use globalize3 for ja and en
[globalize3] add to enrollment status, seends and migration
[enrollment status] refactor enrollment status in students/view
Add enrollment_status_id in Student for versioning
Merge branch 'develop' of git://github.com/tapalilov/GAKUEngine into develop

Conflicts:
	core/app/views/gaku/students/_show_table.html.slim