Completely towards Reader/Writer pattern
Conflict resolution finished
Changes to reflect new sync field (fromAddress => uniqID) and removal of legacy in CxSync
Some debugs introduced in previous commit, added testing for updates in toDoUsers
Final updates: this now works as well as can be expected
Removal of unused files