make sure we only build the year when it's there. Validtion error otherwise.

Fixes #4725
Document that master branch needs Rails 4.1

Closes #4735
Fix broken icons in the admin interface.

Conflicts:
	backend/app/assets/stylesheets/spree/backend/shared/_icons.scss

Fixes #4731
Reorder short circuit evaluation of Estimator#shipping_methods

Fixes #4730
Uses the taxonomy method in the show taxonomy API action.

So it is easier to extend it.
Extracts taxonomies scope to its own method in the taxonomies controller.

So it is easier to extend it.
Added Korean translations for JQuery validate plugin

Fixes #4740
explained tests dependency how to set up environment

Fixes #4705
Fall back to name on CreditCard#to_active_merchant

Gateway provided via active merchant might use those first and last name
instead of the single name string

Fixes #4728
Changing currency variable according to google analytics docs

Fixes #4743

Conflicts:
	frontend/app/views/spree/shared/_google_analytics.html.erb
Drop Spree::Core::TokenResource

None of spree components use that feature except for the token attribute
itself which we could just move to Order so we can run less things when
creating an object

Closes #4736
Don't round amounts of decimal preferences
Fixes #4719
Revert "Drop Spree::Core::TokenResource"

This reverts commit 239181e61aa5f4be86dc788fc52cee6443c452ec.
add configurable option to clone products without copying original images

Fixes #4711
The event object needs to be passed into js function.