Misc changes
Merge branch 'master' of https://github.com/maokomioko/stv

Conflicts:
	app/controllers/spree/products_controller_decorator.rb