Move most of the code to the variant decorator
fix admin form override to show threshold field
Merge branch '2-0-stable' into 2-1-stable

* 2-0-stable:
  fix admin form override to show threshold field
  Move most of the code to the variant decorator

Conflicts:
	app/models/spree/product_decorator.rb
	app/models/spree/variant_decorator.rb