Inline accept/reject buttons for friend requests
Merge remote-tracking branch 'upstream/master'