Merge branch 'master' of https://github.com/Javafant/diaspora-api