updated user model
Merge pull request #1 from dancingshell/master

updated user model