accept and reject friend requests
Merge branch 'preferences'