Merge branch 'develop' of https://github.com/martakostova/GAKUEngine into develop
Merge branch 'develop' of https://github.com/kalkov/GAKUEngine into develop

Conflicts:
	admissions/app/views/gaku/admin/admissions/_links.html.slim
Merge branch 'develop' of https://github.com/absolu7/GAKUEngine into develop

Conflicts:
	admissions/app/views/gaku/admin/admissions/_links.html.slim
[view] achievements tab in student#show
Merge branch 'develop' of github.com:tapalilov/GAKUEngine into develop
[views] admissions manual progress logic
[locales] add admission phase state locales
[views] dont add student to state if he is already in that state
[models] add scopes to admission phase record