added more groups and shuffled around the friends
merged mock_server branch and deprecated 2 API endpoints