refactor array merge
add comments
delete unused code
fix bug in entry merging
rewrite array patch for new diff format
add more array merge tests
implement new collection diff format
add array merge conflict resolution
Merge branch 'test'

Conflicts:
	lib/array/merge.js