Removing unneeded webform template files
Add webform template
Merge branch 'master' into test

Conflicts:
	templates/webform-mail.tpl.php