Merge remote-tracking branch 'origin/master'

Conflicts:
	app_other_cart.rb