[dash] sync platform_type to Jirafe
Fix Ruby 1.8 syntax incompatibility within Spree::Api::BaseController
Remove commented out factory from payment_factory
Add field for attachment_url preference to image settings page

Fixes #2344
Remove commented out lines from payment factory
Bump ActiveMerchant dependency.

Fixes #2346
use ruby 1.8 hash syntax
Fix split_prices_from_variants rollback migration

- Change scale and precision
- Fix data migration
- Add `:null => false` to `spree_variants`

Fixes #2358
Use localized error message for email validator

Fixes #2364
Optimised images

Fixes #2349
fix inline javascript for address state elements

Fixes #2357
Fix - Shipment includes vat is allways false after save

Fixes #2368
Fix The action 'show' could not be found for Spree::Admin::TaxSettingsController

Fixes #2368
Improves promotion#products collection method

promotion#products should return products from all rules that respond to
a products method and not just from the built in PromotionRule::Product
class.

This should make it easier for developers to use their custom rules to
interact with Spree::Promotion

Fixes #2363
move gateway form required chars "*"

close to their labels to uniform with the rest of forms

Fixes #2362
Fixed issue with duplicate thumbnails on ProductController#show

Fixes #2361
Remove debug from -v/--version call
Updated paperclip rake command with proper class info for spree.

Fixes #2369
Correct Taxon class reference in taxon.rake

Fixes #2370
Make admin/orders/shipments_spec.rb not dependent on a checkbox's id