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
Add spree/credit_card.base translation

This is necessary due it to being used in API responses when the payment step fails in CheckoutsController
[api] Resolve orders issue where user_id was always null when updating order

Fixes #3369
Fixes #3378

Conflicts:
	api/app/models/spree/order_decorator.rb
	api/spec/controllers/spree/api/orders_controller_spec.rb
Clean up RSpec deprecation warnings wrt 'should_not raise_error(SpecificError)'
Correct reference to Spree::Core::ProductFilters inside product_filter_spec
[sample] Move line items creation into orders.rb, ensuring that orders have shipments created before they transition into complete
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.
Fix backend specs for Capybara 2.
Add .ruby-version to gitignore.
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.
Create partials for every section of admin layout

Help users and extensions to customize those sections more easily
Remove useless modules from core spec_helper. [Fixes #3411]