Update CHANGELOG.md
Make OptionCallback non-static class
Make OptionCallback/Converter non-static
Merge branch 'develop' of github.com:syncany/syncany into develop
Correct 'sy daemon*' output
Merge branch 'develop' into bugfix/issue303-delete-moved-files