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.
Adding missing packages to requirements_demo.txt
Added missing datatypes
Fixed offers fixture
previous failed with
'sites/demo/fixtures/offers.json': Cannot set values on a
ManyToManyField which specifies an intermediary model.  Use
offer.RangeProduct's Manager instead.
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
Merge remote-tracking branch 'upstream/master' into fix-basket-cookie

Conflicts:
	oscar/apps/basket/middleware.py
Replace stockrecord_tags with purchase_info_tags in demo-site templates and docs as invented in oscar0.6. See https://github.com/tangentlabs/django-oscar/commit/6341b576bf9fa18c4dc1c78aaa88e174826763f6
Update demo templates to use updated templatetag names
Replace session_strategy template tag with purchase_info_for_product in demo-site temaplates and doc. See https://github.com/tangentlabs/django-oscar/commit/a8a140fa94baa13f778f9a1529de8d5c2b75e3f2
Include full Solr conf folder in demo
Merge pull request #1095 from okfish/fix/adjust-demo-to-0.6

Demo-site templates updated for oscar 0.6 release
Use uWSGI and supervisor for demo site
Use normal filename for supervisor conf file
Reinstate Whoosh

Which is needed by Travis.
Merge pull request #1086 from vmasutin/demo-fixes

demo target fixes
Correct nginx block for media images