Make simple zoom work with product, with or without variants
Merge branch 'dev' into 2-1-stable

Conflicts:
	app/assets/javascripts/store/zoom.js.coffee.erb