added templates for html
Merge branch 'master' into jackie
jackie