grant/revoke admin role
admin rename
Merge branch 'master' into admin