Fixed conflict handling
Merge branch 'master' of https://github.com/aegif/CmisSync