Moved the conflict resolution handling from the databinding into the views and triggered off the _conflictedFields attribute
Update the conflictedFields and dirtyFields arrays on conflict resolution
Conflicted inputs now show up when the inspector is rendered
Removed tests from the old databinding conflict code which no longer exists and added new tests for the new conflict interaction
Merge pull request #584 from hatched/new-conflict-ui

Hook up the conflict UI to the new _conflictedFields attribute

The changes to the config attribute interactions made the previous databinding conflict code no longer functional. This switches it over to use the new `_conflictedFields` attribute while using as much of the same databinding and conflict architecture as possible because of the time constraint.