Update CHANGELOG.md
Merge branch 'develop' of github.com:syncany/syncany into develop
Merge branch 'develop' into feature/conservativecleanup