Friendship implementation continued on google map
Merge remote-tracking branch 'origin/master'