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
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
Merge branch 'develop' of git://github.com/kalkov/GAKUEngine into develop
admissions soft delete
Merge branch 'develop' of git://github.com/kalkov/GAKUEngine into develop
[grading/fix] present as default attendance type, blank are allowed for reason
[specs] minor fixes
Fix i18n issues