Edit Friend View Control
Merge remote-tracking branch 'origin/master'
Edit Friend View Control
Merge remote-tracking branch 'origin/master'
EditFriends and Friends View Controller