Database model (fixed)
Merge branch 'master' of https://github.com/sergey-zakharov/EdPlatform