Add xhtml template #5
Merge branch 'origin/dev'