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