debugging
Merge branch '2-1-to-2-0' of https://github.com/SebAshton/spree_variant_options into 2-1-to-2-0

Conflicts:
	spec/features/admin/products/images_spec.rb