removed user group functionality
Merge branch 'removeusergroups' into develop