Merge branch 'hotfix/v0.1.0.1'
Merge branch 'release/0.1.1.0'
Merge branch 'release/0.2.0.0'
Merge branch 'master' of https://github.com/diaspora/diaspora into develop