user management back-end
Merge usermanagement branch to master