checkout actions added
Merge branch 'checkout'

Conflicts:
	spec/features/cart_spec.rb