Bump rails to 3.2.12
Ensure json gem version is at least 1.5.5 [Thanks to Steve Root for
notifying us of this]

Conflicts:
	core/spree_core.gemspec
Remove Mass Assignment of Role IDs
Thanks to Laurens Nienhaus for reporting
Version bump (1.1.6)
Version bump (1.1.7.beta)
Freeze to jquery-rails 2.1.4 as jQuery 1.9 breaks a plugin

This port the commit 3e476ba5a07ed0aea0e68b361814269b3b5e4109 from branch 1-2-stable.

Fixes #2646
Fix user autocomplete for admin orders.

Fixes #2655
Update activemerchant to requiring at least 1.31.x + ransack to 0.7.2

Fixes #2661
Bump rails to 3.2.13
Fix Spree.translations corruption of I18n cache

Fixes #2711
Mailers now require a from address, so we need to give defaults, using MailMethod.current
Correct MailMethod usage in mail_interceptor, order mailer and shipment mailer specs

Conflicts:
	core/spec/mailers/shipment_mailer_spec.rb
Invoke callbacks in #create and #update

Fixes #2736
Correct filename for diners club credit card icon

Fixes #2726

Conflicts:
	frontend/app/assets/images/credit_cards/icons/diners_club.png
Fix email validation error I18n symbol lookup

And include %{value} for interpolation in validation messages.
If not specifying a custom validation message or symbol this
will now use the same error message as rails' format validator.

This is the proper fix for the issue mentioned in PR #2364.

Fixes #2729
fix token field data to allow ' in the product name. Fails if product name is ex. "70's T-Shirt"

Fixes #2811
Return commerce_tracking in analytics_helper_spec so that completed_analytics_tag test passes
Use separate databases depending on the value of ENV['TC_AGENT_NUMBER']
Bump selenium-webdriver to 2.30.0
Allow sample to generate its own testing app