change html out > xhtml
Merge remote-tracking branch 'origin/master'