Make OptionCallback non-static class
Make OptionCallback/Converter non-static
Merge branch 'develop' of github.com:syncany/syncany into develop