Fix custom_range bugs with ugettext_lazy in custom range object name,
and unique fields error when creating existing custom ranges.
Fix for delegate of num_products to a proxy class as documented.
Fix issue with updating basket cookie in the middleware

Handle the case correctly where the basket cookie needs to be deleted
and updated in the same request. This can happen when unfreezing the 
basket. Django's response.delete_cookie doesn't remove the cookie from
request.COOKIES so we need to manually check this.
applies_to_tax_exclusive_prices  has been removed
Bring templatetags inline with earlier renames
commits:
a8a140fa94baa13f778f9a1529de8d5c2b75e3f2
6341b576bf9fa18c4dc1c78aaa88e174826763f6
Added DATACASH_CURRENCY="GBP" to the settings.py
needed by django-oscar-datacash
Extract method that applies the dashboard product list search query
Filter out products the the user isn't allowed to edit in one place

for all affected views. Also make it easy to customize or replace how
products are filtered for non-staff users.
Extract ordering the queryset into a method
Remove now unused method Product.is_user_a_partner_user
Don't hide base class get_queryset.

And get the model object name from the model attribute that
get_object_dict expects to exist anyway. Reason:

class OscarListView(generic.ListView):
    def get_queryset(self):
        ...

class CustomListView(BulkEditMixin, OscarListView):
    # calling get_queryset on this class would resolve to BulkEditMixin.
    # get_queryset and return None.
Retrieve objects from get_queryset instead of default manager.

This allows a customized installation to prevent objects from being shown
(by ListView) and edited (by BulkEditMixin) in just one place,
get_queryset().
Allow override of RegisterUserMixin

The user_registered signal is not enough because we extended the
registration form with some fields that we need at user registration.
reduce db calls in production models
Merge remote-tracking branch 'upstream/master' into fix-basket-cookie

Conflicts:
	oscar/apps/basket/middleware.py
Allow getting SMS template from file instead of database

In ba59c014 the test that decides if the model field or a template file is
used for the SMS template was changed to is not None. However,
sms_template, unlike the other three template fields, does not allow NULL
values, so this test would always succeed, and thus a template file would
never be used for the SMS.
Merge pull request #1091 from mbertheau/allow-registerusermixin-override

[CUSTOMIZATION, 0.6, LOW_RISK] Allow override of RegisterUserMixin
Merge pull request #1087 from st4lk/promo_db_calls

Use base_queryset() in promotions app
Merge pull request #1059 from mbertheau/partner-user-customizing

Partner user customizing

Conflicts:
	oscar/apps/catalogue/abstract_models.py
Docs: Emphasize need for virtualenvwrapper

In our instructions, it wasn't entirely clear that virtualenvwrapper is
required for setup.

Fixes #1088