no need to check remote for just-created file

rationalized conflict filenames
refactoring
dont upload conflict versions
Merge branch 'master' of https://github.com/nicolas-raoul/CmisSync
Fixed conflict handling
Bumped version 1.2.7
Merge branch 'master' of https://github.com/nicolas-raoul/CmisSync