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
Merge branch 'develop' of git://github.com/tapalilov/GAKUEngine into develop
Merge branch 'develop' of git://github.com/kalkov/GAKUEngine into develop
Merge branch 'develop' of git://github.com/kalkov/GAKUEngine into develop
[grading] fixing issues with bootstrap bug for toggle
[specs] admission specs fix
Merge branch 'develop' of git://github.com/kalkov/GAKUEngine into develop
[specs] minor fixes
Fix i18n issues
Merge branch 'develop' of git://github.com/martakostova/GAKUEngine into develop
Merge branch 'develop' of git://github.com/tapalilov/GAKUEngine into develop