Changed the email to display all the form information in the email
Merge remote-tracking branch 'origin/master'