Dumped "xhtml" output type from sample app and introduced a replacement, closes #802
merge 52b56eb555d5a4db13e429c0c49f20534e0b5f3a...fac7bccce4df68bc21f630d7ced1a8688c643aa5 (from 0.11)