promo orders controller decorator overriding blank order check from core
Fix conflicting ids in admin/orders/_form.html.erb

Fixes #2976
Specify class name for calculator association in calculated_adjustment

Otherwise, top-level classes that include this module will have an association that looks for ::Calculator, rather than Spree::Calculator
Fix variant thumbnails not showing on frontend

The thumbnails for variant would not show on variant click. And the
product page opened without any visible thumbnails.

Fixes #3130

Conflicts:
	core/app/assets/javascripts/store/product.js.coffee
	core/app/views/spree/products/_thumbnails.html.erb
Disable Jirafe
Remove dash gem
Remove overview tab until Jirafe issues are sorted.
Remove dash stuff from Rake
Bump to 1.3.3
Allow admin created orders to accept payments

(courtesy of @bbuchalter)

Fixes [#3098]
Downcase s3_protocol configuration option to prevent bugs like https://gist.github.com/radar/5793814

As seen in: https://groups.google.com/group/spree-user/browse_thread/thread/152ceac667a80147
Remove check for overview link in homepage_spec
only show payment source form if source required

Fixes #3195
Dont send a HTTP POST when removing non-persisted nested fields

Fixes #3204
Check promotion eligilbity before performing CreateLineItems promo action

See coresponding 1-2-stable fix in pull request 3147.

Fixes #3219
Wrap permalink saving in a with_lock block to lock the table during updating

In addition, only select the permalink field from the table when querying all similarly-prefixed permalinks

This should prevent duplicate permalinks being generated by different processes hitting the database at the same time.

Fixes #2714

Conflicts:
	core/lib/spree/core/permalinks.rb
Improve comment for Order#has_unprocessed_payments?

Fixes #3226
jQuery Validate IE9 event handle fix
Reload shipments during Order#finalize to prevent possible attempts to call update_column on objects representing records that no longer exist

Code to repo:

bundle exec rails c

require 'ffaker'
require 'spree/core/testing_support/factories'
order_number = R583837274
shipping_method = FactoryGirl.create(:shipping_method)
payment_method = FactoryGirl.create(:payment_method, :display_on => front_end)
order = FactoryGirl.create(:order, :number => order_number)
order.shipping_method = shipping_method
order.state
order.next
order.state
order.next
order.state

Stacktrace is this:

ActiveRecord::ActiveRecordError: can not update on a new record object
  from /Users/ryanbigg/.rbenv/versions/2.0.0-p0/lib/ruby/gems/2.0.0/gems/activerecord-3.2.13/lib/active_record/persistence.rb:195:in `update_column'
  from /Users/ryanbigg/Projects/gems/spree/core/app/models/spree/shipment.rb:105:in `update!'
  from /Users/ryanbigg/Projects/gems/spree/core/app/models/spree/order.rb:392:in `block in finalize!'
  from /Users/ryanbigg/.rbenv/versions/2.0.0-p0/lib/ruby/gems/2.0.0/gems/activerecord-3.2.13/lib/active_record/associations/collection_proxy.rb:89:in `each'
  from /Users/ryanbigg/.rbenv/versions/2.0.0-p0/lib/ruby/gems/2.0.0/gems/activerecord-3.2.13/lib/active_record/associations/collection_proxy.rb:89:in `method_missing'
  from /Users/ryanbigg/Projects/gems/spree/core/app/models/spree/order.rb:392:in `finalize!'
Add inventory units for order, now necessary when testing create_shipment method