Correctly compare relations with shared origin.
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
Moar commenting!
Remove relation from services relations list only after callback.
Make lint happy.
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.
Merge pull request #586 from makyo/drag-uncommitted

Remove relation from services relations list only after callback.
Merge pull request #583 from kadams54/fix-compare-relationships

Correctly compare relations with shared origin.

The previous implementation did not handle comparing relation sets that shared one endpoint, but not the other. If either endpoint was shared, the comparison function returned true, that the relations were the same. Now it will check to make sure that both endpoints, instead of just one, are shared.
Set version for release