Updates to PendingFriendMapper
Merge remote-tracking branch 'origin/master'
More updates to Pending Friend Mapper
Merge remote-tracking branch 'origin/master'