fix reports url
Merge branch 'merge' of github.com:watg/spree into merge

# By mtomov
# Via mtomov
* 'merge' of github.com:watg/spree:
  order summary report with promo code

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
Merge branch 'merge' of github.com:watg/spree into merge

* 'merge' of github.com:watg/spree:
  order summary report with promo code
Bugfix: Taxons could not be ordered

If you reorder the taxons in the admin interface, it does not
have any effect, because the ordering of the taxons is not
used. Setting a default scope with this ordering fixes that.

Fixes #3891
Fixes #3833
Fixes #3390
Use correct default_scope syntax for Rails 4 in Taxon
-Fix the taxon update order issue, using spree patches