Dumped "xhtml" output type from sample app and introduced a replacement, closes #726
merge e13edd863c0f69190cc370b2e8a522d782677184 to 01062799ec1f97b903108e49b6a87966a2251317 (from 0.11)
merge c1a98bb66c6e2b19c565f984cf2c5b9cd36f401b to e85fa4e48a13d27176ce3193720028542fd87774 (from master)