Changed email to e-mail and …

Firstname to First name, Lastname to Last name
Changed email to e-mail
Changed email to e-mail
Update voucher.php
Merge pull request #1624 from Urs-Bruelhart/patch-11

Changed email to e-mail and …