[fix] attendance_chooser view
[fix] mini
Merge branch 'master' of github.com:snowsunny/GAKUEngine
[fix] new student datepicker
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
Merge branch 'develop' of git://github.com/martakostova/GAKUEngine into develop
Fix some failing tests in students
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
[model] include new default scope for student