Updated to latest user-manager
Merged master into production and set version to 0.1.1