more order editor work done
Merge branch 'master' of https://github.com/opencart/opencart

Conflicts:
	upload/admin/view/template/marketing/affiliate_form.tpl
	upload/admin/view/template/setting/store_form.tpl
	upload/catalog/view/theme/default/template/account/address_form.tpl
	upload/catalog/view/theme/default/template/account/register.tpl
	upload/catalog/view/theme/default/template/affiliate/edit.tpl
	upload/catalog/view/theme/default/template/affiliate/register.tpl
	upload/catalog/view/theme/default/template/checkout/guest.tpl
	upload/catalog/view/theme/default/template/checkout/guest_shipping.tpl
	upload/catalog/view/theme/default/template/checkout/payment_address.tpl
	upload/catalog/view/theme/default/template/checkout/register.tpl
	upload/catalog/view/theme/default/template/checkout/shipping_address.tpl
	upload/catalog/view/theme/default/template/product/product.tpl