Merge branch 'develop' of git://github.com/kalkov/GAKUEngine into develop
Merge branch 'develop' of git://github.com/kalkov/GAKUEngine into develop
Merge branch 'develop' of git://github.com/martakostova/GAKUEngine into develop
Merge branch 'develop' of git://github.com/kalkov/GAKUEngine into develop
wip fixes in bactories, locales and admission specs
Merge branch 'refactor_admissions' of git://github.com/absolu7/GAKUEngine into develop
add missing locale
[soft-delete + disposal] soft-delete and admin/disposlas/student_address
[remove js] remove destroy.js for student address
Merge pull request #134 from tapalilov/develop

addresses soft-delete
Merge branch 'develop' of https://github.com/Genshin/GAKUEngine into develop
Use to_s method for Student in admin/disposals/student_addresses
Add disposals/student_addresses to the menu
Change full_name to to_s for Student
fix admission controller - load period/method for changer actions
Merge branch 'refactor_admissions' of git://github.com/absolu7/GAKUEngine into develop
Implement saving of soft_delete history for student address and spec for it
fix admission controller - load period/method for changer actions v2
fix locales
Merge branch 'master' of git://github.com/Kagetsuki/GAKUEngine into develop