further improve checkout step 2
Merge branch 'feature-cart' of github.com:fairnopoly/fairnopoly into feature-cart

Conflicts:
	app/helpers/application_helper.rb