cleanup
UserService update
UserService update
Merge branch 'master' of github.com:PosMich/unwatched