Fix shopping cart link
Merge branch 'master' of github.com:katke/mano

Conflicts:
	app/controllers/vendors_controller.rb