Added some more XHTML replacement and relative unit test. Content_type comfigurable.
Merge pull request #1277 from g4b0/contentnegotiator-xhtml-addition-rc2

Added some more XHTML replacement and relative unit test