Test for broken currency representation.
Fix active merchant for some currencies.

Currencies without 2 decimal places would not be correctly represented
to active merchant, as they would always be multiplied by 100.

As an example, something costing 200 yen would pass 20000 yen to active
merchant.

This now uses the cents from the money object which handles this logic
much better.

Fixes #2930
Fix exception when product brand is nil

Fixes #2927
Rely on spree_user mappings from Devise, not user

For reasons, see commit 4a27c35fd29cf4fcafc1cf6b2401d937361610b9 in spree_auth_devise
Link Country Based and State Based labels to radio control

Fixes #2928
Allow users to not override default mailer configs

Fix from_address logic in mailers, it broke when there were no
mail_method record on the database

Fixes #2918
adding spec and fixing user_logged_in promo rule

Fixes #2884
Use Ruby 1.8-hash syntax in mailers
adding spec and fixing user_logged_in promo rule

Fixes #2884
adding spec and fixing user_logged_in promo rule

Fixes #2884
adding spec and fixing user_logged_in promo rule

Fixes #2884
Add short explanation to tax rate amounts to ease confusion
Greatly reduce number of drawn routes on Spree::Core::Engine

See explanation in https://github.com/radar/spree/commit/c7c260278b3de9660289c756104deef5298c5082
Guard against admin js files being loaded outside of the actual admin

This can happen if application.js has a //= require_tree . directive
Bump Modernizer to 2.6.2
Enforce usage of in screen.css.scss and add a new variable to the variables.css.scss file to allow for an easier customization

Fixes #2933
[api] Allow especially overriden attribute setters for line items

Fixes #2916
Merge branch '1-3-stable' of github.com:spree/spree into 1-3-stable