Merge branch 'master' of git://github.com/kalkov/GAKUEngine into develop
Merge branch 'refactor_admissions' of git://github.com/absolu7/GAKUEngine into develop
Merge branch 'refactor_admissions' of git://github.com/absolu7/GAKUEngine into develop
Merge branch 'develop' of git://github.com/tapalilov/GAKUEngine into develop
fix conflict after merge
Merge branch 'refactor_admissions' of git://github.com/tapalilov/GAKUEngine into develop
Merge branch 'develop' of git://github.com/tapalilov/GAKUEngine into develop
updated locales
Merge remote-tracking branch 'tapalilov/develop'
Merge remote-tracking branch 'kalkov/develop'
Merge branch 'develop' of git://github.com/tapalilov/GAKUEngine into develop
Merge branch 'develop' of git://github.com/kalkov/GAKUEngine into develop
pull from tapalilov
Merge branch 'develop' of git://github.com/kalkov/GAKUEngine into develop
pull tapalilov
[specs] admission specs fix
Merge branch 'develop' of git://github.com/martakostova/GAKUEngine into refactor_admissions
admissions soft delete
Merge remote-tracking branch 'kalkov/develop'

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