Fixing Relations and migrations
Merge pull request #135 from alaashafaee/dev_models

Fixing Relations and migrations