Fixed bug in user joining groups.
Fixed bug in user joining groups.
Fixed bug in user joining groups.
Added uuid's for groups.
Merge branch 'test' into dev