merge conflict
Merge branch 'master' of github.com:jtamiace/FacebookLikeMap
request friends and mutual friends