User migration and model
Fix user migration
Merge pull request #2 from rantoniops/christian

User migration and model