Merge remote-tracking branch 'upstream/feature/newgroups' into feature/newgroups
Debug Workgroups
Debug Workgroups
Merge remote-tracking branch 'mghilaci/feature/newgroups' into feature/newgroups
relink correct html template (need work)