Merge pull request #10 from plus3network/master

Adding Models and Seed Data Generator to Tests
todo
travis fix
Fixing conflict