Merge branch 'product-class-use-slug-in-URL' into machtfit

* branch product-class-use-slug-in-URL:
  Use slug instead of id for product_class in URL

https://github.com/tangentlabs/django-oscar/pull/1123
discussion pending

merge arbitrary-number-of-permissions
https://github.com/tangentlabs/django-oscar/pull/1140
merged in 0.7
Merge branch 'fix-tests' into machtfit

* branch fix-tests:
  Positional argument specifiers are needed for python 2.6

https://github.com/tangentlabs/django-oscar/pull/1176
Merge branch 'fix-pep8' into machtfit

* branch fix-pep8:
  Fix flake8 warnings

https://github.com/tangentlabs/django-oscar/pull/1177
Merge branch 'dashboard-catalogue-easier-search-customization' into machtfit

* branch dashboard-catalogue-easier-search-customization:
  Handle removed search fields in customized ProductSearchForms

https://github.com/tangentlabs/django-oscar/pull/1180
Merge branch 'dashboard-catalogue-preserve-order-in-search-form' into machtfit

* branch dashboard-catalogue-preserve-order-in-search-form:
  Preserve sort order in search form

https://github.com/tangentlabs/django-oscar/pull/1181
Merge branch 'django-tables2' into machtfit

* branch django-tables2:
  Keep current tab and ordering when returning to the list after editing
  Move the dashboard product list to django-tables2
Bump version.