reworked infinote-transform. added deletion conflict handling
Merge branch 'dev' of github.com:collab-mode/collab-mode into dev

Conflicts:
	infinote.el