Change JS so that page is reloaded after the item has been added to the target shipment, not just after it has been removed from the original shipment.  Remove an extraneous stock location create.

Fixes #3576

Removing notification email so Ryan doesn't get spammed by Travis on my fork

Allow different quotes for different databases in the order clause

Fixes #3577

Add an explicit order to the query, rather than depending on the implicit order from the database.

Fixes #3579

Conflicts:
	api/app/controllers/spree/api/taxons_controller.rb
Skip validations in migration so we don't reference columns that don't exist.

Fixes #3584
Re-add test_mailer view so that TestMailer functions.  Change TestMailer to take an id, so it can support Resque/Sidekiq.  Update controller to pass an id rather than the user object itself.  Update spec to use persisted user.

Remove the 'try(:id)' and just depend on the controller itself to ensure we have a legitimate current_user

Fixes #3581
Credit Card expiry comparison logic incorrect outside of UTC - would fail with card_expired method if CC is expiring this month

Fixes #3578
capybara 2.1 requires visible: false to match elements in <head>, and other invisible elements
Clear tax adjustments only in TaxRate#adjust

It doesn't make sense to remove all line item adjustments from
TaxRate#adjust because price adjustments might come from other classes
such as ShippingMethod and PromotionAction

Fixes #2981

Conflicts:
	core/app/models/spree/order.rb
Fix order deprecation on association.

Conflicts:
	core/app/models/spree/order.rb
Fix deprecation warnings by using line_item_adjustment_totals.
Use order option not a scope for Rails 3.2.x.
Add sample gem to travis config.
[backend] Js lint. Fixes #3544
Fix core order/adjustment spec

It was failing most likely to the default ordering in postgres. I
changed it so that it doesn't depend on the order to be valid anymore

Fixes #3591
Add Gemfile for sample project, add spec task to Rakefile and set it as the default task
Update selenium and remove uneeded gemfile additions.
Allow shipping calculators to return nil values if no service is matched.

With shipping calculators returning 0, we run the risk of choosing and charging
a cost of $0 in cases where for example spree_active_shipping has a failed rate
query with the carrier API. This could be a very expensive mistake.

Current problem as it stands is that with spree_active_shipping returning nil, if
the calculator returns nil, no other rate options are tried and the customer sees
no shipping options in checkout.

This fixes https://github.com/spree/spree_active_shipping/issues/104

Fixes #3588

Fixes spree/spree_active_shipping#104
Waiting for ajax to complete fixes spec from breaking in sqlite3. Fixes #3569
Address feature #3559 .  Add first_day parameter under date_picker config to allow developers to configure the first day of the week on a per-locale basis.  Default to Sunday.

Fixes #3559
Fixes #3595
adds spec to demonstrate that Spree::CreditCard.expriy_not_in_the_past is incorrect.  fixes validation bug inside Spree::CreditCard.expiry_not_in_the_past.

Fixes #3454
Fixes #3466
Missing translations. Fixes #3548
Skip stock status when track_inventory_levels false

No need to check stock status for any item on the order if the store
doesn't care about inventory levels. Noticed after reading #3438

Fixes #3440