Added user model and table
Merge branch 'user'