friend groups module
Merge branch 'raysmond'