add user model
Merge branch 'dev'