#953 remove bxslider in favour of existing bootstrap version
#871, #900: remove elastslide,colorbox,responsive gallery dependancy, replace with existing bootstrap modified carousel for multiple image gallery
#871 default gallery slightly better looking, not need for absolutes
Merge branch 'master' of https://github.com/tangentlabs/django-oscar into issue/871/carousels
Remove currency filter on fields that arn't currency
Fix error message for currency mismatch

Currency of the basket and line were swapped leading to confusing error
message.
Merge pull request #1005 from tangentlabs/bugfix/correct_formatting_in_offers_dashboard

Remove currency filter on fields that arn't currency
Ensure alert list requires login

Was missing auth decorator beforehand.
Ensure predicate fields have ? at end of verbose name
Merge pull request #1004 from mbertheau/template-customization

Add blocks to make template customization easier
Merge pull request #973 from informa/issue/871/carousels

Remove external dependencies and rely on Bootstrap's carousel
Fix context variable naming bug for profile fields

The template expected a different variable from what was passed into the
context. Fixed now.

Reported by @izidormatusov. Fixes #909
Merge pull request #1006 from tangentlabs/issue/currency-mismatch

Fix error message for currency mismatch
Remove unused AbstractProductImage properties for thumbnailing

Images are resized on the template level with Sorl, so having
those properties only leads to confusion. They were not used by stock
Oscar. Furthermore, thumbnail_url returned the full-size image URL,
which is wrong.

Fixes #1011
Quantize after calculating tax

Previously, returned prices would suddenly have more decimal places.
Quantizing appropriately fixes this.

Fixes #994
Ensure migrations reference user model wrapper
Add missing labels for form fields

Otherwise they can't be translated.

Fixes #1003
Docs: Add note regarding documentation style guides
Merge branch 'origin/fix/shipping_method_failure' into machtfit

* branch origin/fix/shipping_method_failure:
  Allow shipping_address being 'None' for an order
Merge branch 'add-no-shipping-required-to-default-repository' into machtfit

* branch add-no-shipping-required-to-default-repository:
  Make NoShippingRequired available by default.

Issue #999 Checkout broken if all products don't require shipping
https://github.com/tangentlabs/django-oscar/issues/999
https://groups.google.com/forum/#!msg/django-oscar/nC3rJV54oZQ/Ms_zcTd54bAJ
PR #1: https://github.com/tangentlabs/django-oscar/pull/956
PR #2: hab ich keinen erstellt weil die Diskussion noch ongoing ist
für PR #1 gibt es eine Alternative: https://github.com/tangentlabs/django-oscar/pull/910