Include sample in top level rake test and test_app
add missing respond_with to some API controllers and add tests

update spec to test custom rabl template

inject custom view into dummy app

ensure usage of respond_with for orders and inventory_units

Conflicts:

	api/spec/controllers/spree/api/products_controller_spec.rb

add respond_with to ProductsController

test through custom action instead

remove fileutils
Merge pull request #5101 from themetric/fix-api-custom-template

add missing respond_with to some API controllers and add tests
goodbye aws-sdk one less core dependency
Merge pull request #4844 from woboinc/bugfix/avoid_name_clashing

Avoid name clashing when including modules
Conflicts:
	core/app/models/spree/order.rb
Merge branch 'test_sandbox' of github.com:jhawthorn/spree

Conflicts:
	Rakefile
Fix ruby syntax error
Merge pull request #5140 from camelmasa/fix-syntax-error

Fix ruby syntax error
Return item cancellation

Creating a new return item should cancel any other return items with the same inventory unit.
This ensures an inventory unit can only be active in a single RMA at a time.
This allows history to be preserved but still allow new RMAs to be created to replace old ones.

Fixes #5048
add validation to verify that count_on_hand of backorderable should not go negative if it is not backorderable

Fixes #3808
add a before_transition to verify if order is resumed only if there are no insufficient stock lines
Fixes #3819
Revert "Set missing credit card attributes when possible. Fixes #4972"

This reverts commit 4ff85703edafd4c607e9b21d439f1d193ccee519.
Create Spree::Promotion::Taxon rule.

Fixes #4477
Fix typo.
Fix API::Orders#create  for admins.
Fix duplicated promotion rule
Fixes #5144
Refund preferences & Reimbursement Items

- Allow admins and customers to specify refund types
  - Provide a field for customers to specify a refund method preference at RMA time
  - Allow admins to specify an override refund method at reimbursement time
- Break out reimbursement_items from return_items into a separate DB table
  - Paves the way for non-return reimbursements. It also makes ReturnItem a bit simpler.

Minor:

- Fix the x icon on select2 selectboxes.
- Convert CustomerReturnsController into a ResourceController

Generated by @jordan-brough and @richardnuno

Fixes #5146
Default credit card per user

When an order is completed, we save the credit card used as the user's
default credit card. When creating a new order, we use an existing
credit card (if it exists) and attach it to the order before reaching
the payment state.

Fixes #5148