Call the listeners observers and improve tests.
Bugfixes and tests for conflict resolution.
Added (merge) manager and tests.
item.coffee actually tests all components.