Role assignment now only has one table
Merge remote-tracking branch 'origin/master'