Adding and modifying email submission template
Merge branch 'master' into test
Webform mail template edit
Moving template files
More file moving
Removing unneeded webform templates
Removing unneeded webform template files
Add webform template
Merge branch 'master' into test

Conflicts:
	templates/webform-mail.tpl.php
Adjusting webform template
Moving webform to theme root
Webform changes
More email edits
Moving to templates folder
Add more template edits
more changes
Merge branch 'test'
Small change to push commits thru
Webform template updates to render values
Adding branding bar style fixes