add delivery and payment method items to order form
Merge branch 'master' of github.com:tnris/site-mockup

Conflicts:
	templates/order-form.html