Merge pull request #33 from Neodelf/deploy

add message to payment_type
cosmetic fixes for conditions
fixes for contacts
Merge pull request #34 from Neodelf/deploy

add form to payment_type and change text in orders/new
bugfix