Merge commit '9d116a451fdc39a356a9255de6ca749b0056a952' into develop
Added the XHTML template
Release 1.0.4 stable
Merge branch 'develop'