Huge improvement to User and Role manager
Merge branch 'master' of https://github.com/TomKaminski/TestShop.git