Added abilties to some roles
Merged from origin/master