updated map for friends and places
merge