[student] disposal and soft delete
[student] enrollment status modal & controller
Merge branch 'develop' of git://github.com/kalkov/GAKUEngine into develop

Conflicts:
	core/app/views/gaku/students/enrollment_statuses/_enrollment_status.html.slim
Create module Notable and refactor to use it
Create module Trashable and refactor to use it
[spec/models] Clean student_spec
[fix] modal opening for edit enrollment status break specs
updated messages for SS zaikou importer to Japanese
fix conflict after pull from kalkvo
[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
[admission specs] minor changes for failing specs
Clean after enrollment_status refactoring
Merge branch 'develop' of git://github.com/martakostova/GAKUEngine into develop
[admissions][spec/requests] Fix admission_spec