update Gemfile.lock
add the me/friends endpoint
add the me/friends endpoint
adding logging, clean up merge issues and fixing some tests
Merge branch 'feature/friends' into develop