Removed ability for users to friend themselves
merging