polished permissions and roles
Merge branch 'listview' into dev