Merge branch 'develop' of git://github.com/kalkov/GAKUEngine into develop
[admissions specs] minor fix
Merge branch 'refactor_admissions' of git://github.com/absolu7/GAKUEngine into develop
admission method phases flash on create
[admission specs] add spec for validating creating a student and other minor fixes
Merge branch 'develop' of git://github.com/kalkov/GAKUEngine into develop
Merge branch 'develop' of git://github.com/tapalilov/GAKUEngine into develop
pull tapalilov
include student enrollment status in admissions
Merge branch 'develop' of git://github.com/martakostova/GAKUEngine into refactor_admissions
Add enrollment_status_id in Student for versioning
Merge branch 'develop' of git://github.com/tapalilov/GAKUEngine into develop

Conflicts:
	core/app/views/gaku/students/_show_table.html.slim
pull kagetsuki
Merge branch 'develop' of git://github.com/martakostova/GAKUEngine into develop
Fix some failing tests in students
Merge remote-tracking branch 'kalkov/develop'

Conflicts:
	core/app/views/gaku/students/_show_table.html.slim
Merge remote-tracking branch 'absolu7/refactor_admissions'

Conflicts:
	core/app/views/gaku/students/_show_table.html.slim