Don't rely on friends list being correct, just in case (suggestion by @scholtzm)
Merge branch 'ExposeFriendsAndGroups'