Merge branch 'master' of github.com:kalkov/GAKUEngine into develop
Merge branch 'develop' of github.com:kalkov/GAKUEngine into develop
refactoring state change
Merge branch 'develop' of github.com:martakostova/GAKUEngine into develop
Create ExtracurricularActivity and ExtracurricularActivityEnrollment models and links
add =hr to separte two tables in schools#index
fixing and refoactoring change student state
WIP : Basic extracurricular_activities views
WIP: extracurricular_activities view changes and added request spec
[view] school views fixes
Merge remote-tracking branch 'kalkov/develop' into develop
Merge remote-tracking branch 'absolu7/develop' into develop
Merge remote-tracking branch 'tapalilov/develop' into develop

Conflicts:
	core/config/locales/en.yml
Merge remote-tracking branch 'kagetsuki/develop'