UserModel
Merge branch 'master' of github.com:mseiwert/ws