155 user roles permissions rebase

Rebased and resubmitted from here: https://github.com/Unallocated/UASDrupal/pull/183