Merge branch 'master' into den-templates
Adding template HTML
Merge branch 'den-templates'