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
updated enrollment status seeds
[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
Implement saving of soft_delete history for student address and spec for it
wtf
Merge branch 'master' of git://github.com/Kagetsuki/GAKUEngine into develop
Clean after enrollment_status_type refactoring
Link Student with EnrollmentType
Merge branch 'develop' of git://github.com/kalkov/GAKUEngine into develop
[spec/requests] admin/changes_and_deletions/students_spec
Change deleted field in Student to is_deleted