new templates coming
fix layout replacement
replace welcome template
Merge branch 'template-refactor'

Conflicts:
	templates/welcome.html.ep
fix templates