[refactor] campus contacts
admission chooser will see only pre-admission students
Merge branch 'master' of git://github.com/Kagetsuki/GAKUEngine into develop
Merge branch 'master' of git://github.com/Kagetsuki/GAKUEngine into develop
[fix] has_one address issue with campus
Merge remote-tracking branch 'tapalilov/refactor_addresses'
add new fields to school history
added code to enrollment status and added seeds
Merge branch 'master' of git://github.com/Kagetsuki/GAKUEngine into develop
create admissions students controller and views + refactoring actions
refactoring grey-ing students with enrollment status codes
add default phase(with default state) when creating admission method
...what?
commented out offending line
[model] add default value for enrollment status for student
Merge remote-tracking branch 'absolu7/develop'
fix admissions student form