Updated models and tests to reflect the new permissions from smmdb
Permissions now work
Merge branch 'permissions-sync' into develop