[fix] attendance_chooser view
[fix] mini
Merge branch 'master' of github.com:snowsunny/GAKUEngine
[fix] new student datepicker
Merge remote-tracking branch 'kalkov/develop'

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

Conflicts:
	core/app/views/gaku/students/_show_table.html.slim
merge kagetsuki & fix conflict
updated messages for SS zaikou importer to Japanese
[zaikou importer] include enrollment status to student creating
Clean generator and try to use mysql
Make translation_missing to be default behaviour
Merge branch 'master' of git://github.com/Kagetsuki/GAKUEngine into develop
Merge branch 'develop' of git://github.com/martakostova/GAKUEngine into develop

Conflicts:
	core/app/views/gaku/students/_show_table.html.slim
Add enrollment_status to students new and edit
[model] include new default scope for student
Clean after enrollment_status refactoring
Merge branch 'develop' of git://github.com/martakostova/GAKUEngine into develop
[admissions][spec/requests] Fix admission_spec
Add stdents/enrollment_statuses/_modal
Clean enrollment_status model