Added metadata to users and groups.
Fixes in user and group 404's.
Merge branch 'test' into dev