added nearby friends and chat
Merge branch 'nearby_friends_setup'