more friendship groups redo
Merge branch 'master' into brumdebug
bugfix
Merge branch 'master' into brumdebug