made some changes in models
Merge branch 'demo' of https://github.com/nromanen/Ch-024 into demo