point to spree edge
test for cache classes rather than environment
Merge pull request #90 from Dkendal/spree-cache-classes

test for cache classes rather than environment
Added model_class def to parts_controller
Fixes #96
Fixes #97
Add serializer to master branch as well so its not just on 2-3-stable.
Skip when line items nil.
Change admin line_item_controller_decorator to just admin line_item_controller - add routes
Merge remote-tracking branch 'spree-contrib/2-4-beta' into 2-4-stable

* spree-contrib/2-4-beta:
  Change admin line_item_controller_decorator to just admin line_item_controller - add routes
  Skip when line items nil.
  Add serializer to master branch as well so its not just on 2-3-stable.
  Added model_class def to parts_controller Fixes #96 Fixes #97
  test for cache classes rather than environment
  point to spree edge

Conflicts:
	Gemfile
	README.markdown
	spree_product_assembly.gemspec