Removing code that was never run (because of css change)
Spiking conflict resolution - work in progress
Flushing out Force.syncSObjectDetectConflict - still not used anywhere
Fixes for conflict detection (and unresolved bugs highlighted in comments) / using conflict-detection mode in AccountEditor
Cache no longer a class property - it's an object property or can be passed through options / Misc fixes
Made cache mode and merge mode into enums / moved comments around
Highlighting validation error and conflict error on field
Switching from local to container
Merge pull request #85 from wmathurin/unstable20

Conflct detection changes