need to fix accept friend request so i can run my tests
Merge branch 'master' of https://github.com/Lineaweaver/ActivityApplication.git