prices in euros in order confirmation email no longer have their euro character
aggressively escaped

Fixes #2690
Allow Jirafe analytics data to be edited after registration

Fixes #2238

Conflicts:
	dash/app/controllers/spree/admin/analytics_controller.rb
	dash/config/locales/en.yml
Attempt to reproduce issue #2654
Update controller check to have spree namespace.

Fixes #2686
Bump rails to 3.2.13
Revert Jirafe Override issue introduced in 0ad38fb7
Mailers now require a from address, so we need to give defaults, using MailMethod.current

Conflicts:
	api/spec/controllers/spree/api/v1/shipments_controller_spec.rb
	core/app/models/spree/app_configuration.rb
Truncate product description when used as meta description

Fixes #2396

Conflicts:
	core/spec/helpers/base_helper_spec.rb
Correct MailMethod usage in mail_interceptor, order mailer and shipment mailer specs
Don't require payment methods if payment isn't required
Revert "Don't require payment methods if payment isn't required"

This reverts commit 318b820114d6d631e9be6ddb500e6a234612407f.

This is causing build breakages:

http://ci.spreecommerce.com/viewLog.html?buildId=1533&buildTypeId=bt5&tab=buildLog

payment_required? is calling update_totals, which causes a massive callback
chain and ultimately results in these tests failing
[dash] Fix jirafe settings spec
Fix issue where try_spree_current_user would be nil in analytics spec
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.

The current code hardcodes the I18n key and improperly assigns the error
which leads to several problems:
* You cannot override the translation message for models/attributes
* You cannot pass your own I18n key as a symbol (eg. :invalid_email)
* You cannot use symbol interpolation

This fixes the above problems and is the proper solution for issue #2346.

This fix also applies to 1-2-stable and 1-3-stable.
For a fix against 1-1-stable see PR #2729.

Fixes #2730
nested_taxons_path will now take a Taxon object and generate a proper URL
Fixes orders#show title for i18n cases

Fixes #2784
When a calculator is using a preference of type :text, a textarea is shown. The calculator.js should disable/enable this textarea the same as the input from a preference of any other type.

Fixes #2782
Correct content length check in base_helper_spec test for meta_data_tags
Switch the mailers to be invoked using ids, not model objects. This makes it easier to support asynchronous mail jobs, as only simple ids need to be persisted.

Fixes #2806