add xhtml support base
Merge origin/master