add product type parcel and pattern
Merge branch 'master' of github.com:watg/spree-product-assembly into merge

Conflicts:
	app/models/spree/product_decorator.rb