Merge branch 'hotfix/v0.1.0.1'
Merge branch 'release/0.1.1.0'
Merge branch 'release/0.2.0.0'
Mark changelog to note fix for 4432
Merge branch 'master' of github.com:rsofaer/diaspora into 4432-photo-lightbox-quickfix