Merge branch 'master' into den-templates
New HTML stuucture
Merge branch 'master' into den-templates

Conflicts:
	templates/template-email.html
Merge branch 'den-templates'