Updated to fix price issue
Merge branch '2-1-stable' of https://github.com/BRZInc/spree_variant_options into 2-1-stable

Conflicts:
	app/views/spree/products/_variant_options.html.erb