Merge pull request #20 from hugo187/master

more updates to non-EU customer's zero vat feature
enable lineWrapping for HTML edit
add span.calculated to delivery options
rename email_form to contact_form
paypal template fix