Merge branch 'develop' of github.com:absolu7/GAKUEngine into develop
[views] when only one state in phase, no dropdown for change state
[model] add validation to period method association model
[views] fix admissions index js error
[views] fix admission period edit validations
[views] fix admissions index js error 2
[models] admission state before destroy - refactor
[controllers] when creating admission record - find default state and assign to it
Merge branch 'develop' of github.com:absolu7/GAKUEngine into develop
Merge branch 'develop' of github.com:tapalilov/GAKUEngine into develop
fix conflict after pull
fix conflict after pull
Merge branch 'develop' of github.com:tapalilov/GAKUEngine into develop
fix conflict
Merge branch 'develop' of github.com:tapalilov/GAKUEngine into develop
Merge branch 'develop' of https://github.com/martakostova/GAKUEngine into develop
spec fixings
Merge branch 'develop' of github.com:martakostova/GAKUEngine into develop
Merge branch 'develop' of github.com:martakostova/GAKUEngine into develop
fixing specs