added models and migrations
Merge branch 'master' into migrations_models
updated models and migrations
Merge pull request #2 from nairys/migrations_models

updated models and migrations