fixed friend request and map
Merge branch 'master' of github.com:thejerrybao/CaravanParty

master merge with frontend updates
fixed friend request and map