Filter out the current user when searching for friends and mark any current friends as "already friends"
Merge branch 'master' of https://github.com/geekpgh/mastersproject.git