Ability to handle some user manager function on the server
Merge remote-tracking branch 'origin/master'