fix for delete from my groups (todo: more secure method)
Merge remote-tracking branch 'origin/develop' into develop