Change user model
did the migrate
Merge branch 'thomast push origin master'