merge
Merge branch 'master' of github.com:ginlane/hub_gem

Conflicts:
	app/serializers/spree/hub/order_serializer.rb