esto aqui esta comentado y no se por que
Merge branch 'master' of https://github.com/openjaf/spree_property_type

Conflicts:
	app/models/spree/product_property_decorator.rb