changes on UserModel and User
Merge branch 'master' of https://github.com/bitzesmichail/wsms