Fix conflict.
Bump aws-sdk to fix an s3 timeout error during pre processing. https://github.com/aws/aws-sdk-ruby/issues/241
Misc layout fixes for shipping and stock pages.

Conflicts:
	backend/app/views/spree/admin/stock_transfers/show.html.erb
Update aws-sdk and activemerchant to deal with nokogiri restrictions. Fixes #3625
Lets not run ci against sqlite3 to speed up travis builds by focusing on production databases.
[backend] Consistent no resource found. Fixes #3607
Set promotion rules before app initializer

And add a check in Promotion::Rules::User so associations are only
loaded once the app has set Spree.user_class. That allow users to set
their promotions rules on the spree.rb initializer again. e.g.

    Rails.application.config.spree.promotions.rules = [Spree::Promotion::Rules::Product]

Fixes #3599

Conflicts:
	core/app/models/spree/promotion/rules/user.rb
Fix deleting of images. Fixes #3562
Remove unused filter.
Grab deleted variants from a inventory unit

Needed after paranoia gem introduced a default_scope in variant model

Fixes #3628
Fetch active variant only in order import through api

Fixes #3647
standardized address attributes in api_helpers

Fixes #3646
adds awesome nested sets's 'depth' field in taxons

Fixes #3634
Cleanup Zone Editing

Fixes #3631
Remove promo related deprecated code

Fixes #3563
Order shipping rates by cost ascending

This fixes a problem on the frontend that I saw where they were displaying in indeterminate ordering
Add HUGE GIANT WARNING to installation section of README

Related to #3653
Address information is now only accessible through an order

This is because we need to first look up if the user has permission to view the order. If the user has the additional permission of being able to modify the order, then they should be able to modify the address too.

Fixes #3635
Add a call to advance an order as far as it can go

This is related to #3336, as the backend has been changed to add line
items through the API, but the desired functionality is to continue the
order as far through the checkout process as possible after items have
been added.

Extracting this 'advance' into its own API call will let us remove the
while @order.next; on in spree/admin/orders_controller#update on the
backend.

Explicitly advance an order on variant changes

Previously, correct behavior relied on GET orders/edit advancing an
order as far ahead as possible. This explicitly moves the order as far
ahead as possible rather than relying on the behavior of the GET edit to do
so

Related to #3336

Fixes #3662
Do not call refresh_shipment_rates on an order if it is complete

Fixes #3648