Updated Right and Role model
Merge branch 'origin/master'