Added user roles files and migration
User role stuff
Merge branch 'staging'