Fixed Compiler warning
Implemented conflict case while downloading content
Merge branch 'develop' of github.com:OpenDataSpace/CmisSync into develop