Merge branch 'develop' of github.com:absolu7/GAKUEngine into develop
fix scholarship status factory
fix admission specs
Merge branch 'develop' of https://github.com/martakostova/GAKUEngine into develop
Fix devise deprecation warning
Fix courses_controller_spec and generator error for exam_portion