mocking data
Merge branch 'template'
Merge branch 'master' into den-templates

Conflicts:
	templates/template-email.html