Merge pull request #201 from solispauwels/master

Workspace User managment update
Merge remote-tracking branch 'upstream/master'