use old uid only if the new one isn't already present
Checke if all work - ready to merge back to master
Checke if all work - ready to merge back to master
Merge branch 'legacy_correction' of https://github.com/somedevelopment/CardDAVSyncOutlook into legacy_correction
Corrected indentation in code style and dropped some comments
Fixed merging issues