Finalizing AddFriendToActivity

Merging time :)