fixed
Merge branch 'master' of https://github.com/acreilly/spree_variant_options

Conflicts:
	app/assets/javascripts/spree/frontend/spree_variant_options.js