Merge the userManagement repository

into the manager folder
Merge pull request #30 from tobiasmuecksch/master

Merge the userManagement repository
Merge remote-tracking branch 'upstream/master'