#1 added roles and permisisons
Merge master with issue1