models and migrations
Merge branch 'master' into user_setup
updated models and migrations
made seeds, edited models
Merge branch 'master' into user_setup