New version

I'm merging OOJMerge and HTMLJMerge as they have a lot in common.
This will allow me to revisit the code. Fix a couple of bugs etc.