Fix sample order generator to make the new orders show up as complete
Removes default_per_page method which does not work to upgrade Kaminari.
Make 'Card has expired' error message translateable
[api] Resolve orders issue where user_id was always null when updating order

Fixes #3369
Fixes #3378
[core] Clean up RSpec deprecation warnings wrt 'should_not raise_error(SpecificError)'
Clean up RSpec deprecation warnings wrt 'should_not raise_error(SpecificError)'
[sample] Move line items creation into orders.rb, ensuring that orders have shipments created before they transition into complete

Conflicts:
	sample/db/samples/orders.rb
Added missing comment
CSS fix
[Fixes #3407]
Bump caypbara to 2.1.0:

* Add timeout into config/database.yml template to avoid SQLite3 DB locked out
* Use lenient non-exact setting for Capybara element matcher (same as 1.x)
Capybara 2 updates.
Fix Frontend specs for capybara2.

Conflicts:
	frontend/spec/requests/template_rendering_spec.rb
Fix backend specs for Capybara 2.
Deface should be using 0.9.x.
Fix API specs for Capybara 2 on Ruby 1.9.3.
Dont use database_cleaner when Ruby 2.0+
DatabaseCleaner is not required for Core specs.
Sets stock locations backorderable_default to false and stock item backorderable to false. Fixes #3300
Resolves issue #3401, improve readme on creating database for pre exising spree store

https://github.com/spree/spree/issues/3401
Fix issue where shipping calculators were being passed objects other than Spree::Stock::Package

Fixes #3381