Not sure how but conflict syntax made it into the last commit.
Not sure what this is still doing here.
Fixing bug on friendpage which occurs if a user has no friends.
There are still lots of issues but now accepting friend
requests work. Also notifications window fades away if there are
no more notifications.