Merge pull request #134 from alaashafaee/dev_models

Dev models
Merge pull request #135 from alaashafaee/dev_models

Fixing Relations and migrations
layout basic
Merge branch 'dev_models' of github.com:alaashafaee/Coolsoft-14 into dev_models