sync with master
Merge remote-tracking branch 'upstream/master'
changed the get friends endpoint to follow the changed spec
Merge remote-tracking branch 'upstream/master'
Merge pull request #62 from ahlen/master

changed the get friends endpoint to follow the changed spec