Adding Roles and Autority
Merge branch 'master' into roles
Merge branch 'master' into roles
delete old stuff