refactor checkout shipping step
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/views/checkout_shipping.phtml
Add payment step