fixes admin views
Merge branch 'dev' into admin_role
Merge branch 'dev' into admin_role
Merge pull request #110 from is-valid/admin_role

Admin role