Add basic html body structure
Merge branch 'master' into html-body