-Virtual parts added
Merge branch 'master' of github.com:watg/spree-product-assembly

Conflicts:
	app/models/spree/variant_decorator.rb