XH 1.7: sprint #3

[cmb]

While trying to apply the patches, I noticed that there's neither support for automatic nor manual conflict resolution. I therefore created individual feature branches, applied a single patch a time, and merged the branches to the trunk. All in all that worked well, so I will make feature branches instead of patches for comming proposals. I suggest others do so as well.

Anyhow, all existing patches are merged now, and only two roadmap items of this sprint are on "todo". I suggest that we quickly walk on -- there are plenty of "ideas" waiting.