Towards functional user management
Merge remote-tracking branch 'remotes/origin/master'
Took out role toString comparison