Merge branch 'partner-user-customizing' into machtfit

* branch partner-user-customizing:
  Remove now unused method Product.is_user_a_partner_user
  Extract ordering the queryset into a method
  Filter out products the the user isn't allowed to edit in one place
  Extract method that applies the dashboard product list search query

https://github.com/tangentlabs/django-oscar/pull/1059
Merge branch 'easily-add-new-formset-to-product-update-page' into machtfit

* branch easily-add-new-formset-to-product-update-page:
  Provide a hook for cross-form validation
  Make it trivially easy to add more formsets to the product update page
  Unify __init__ method signature of formset classes
  customize FormSet class after calling inlineformset_factory
  Whitespace, Formatting, PEP8

https://github.com/tangentlabs/django-oscar/pull/1022

merge dashboard-fix-custom-permissions
https://github.com/tangentlabs/django-oscar/issues/993
https://github.com/tangentlabs/django-oscar/pull/1034

Conflicts:
	oscar/apps/dashboard/catalogue/views.py
Merge branch 'origin/issue/992/datetimepicker' into machtfit

* branch origin/issue/992/datetimepicker:
  Upgrade timepicker to current version
  Add correct CSS for date picker

https://github.com/tangentlabs/django-oscar/pull/992
Merge branch 'partials-product-template-block' into machtfit

* branch partials-product-template-block:
  Add template block for easier customization

https://github.com/tangentlabs/django-oscar/pull/1051
Merge branch 'passwordreset-singleobjectmixin' into machtfit

* branch passwordreset-singleobjectmixin:
  Make it easy to restrict the users you can use this form with.

https://github.com/tangentlabs/django-oscar/pull/1052
Merge branch 'bulkeditmixin-use-get-queryset' into machtfit

* branch bulkeditmixin-use-get-queryset:
  Retrieve objects from get_queryset instead of default manager.
  Don't hide base class get_queryset.
  Whitespace

https://github.com/tangentlabs/django-oscar/pull/1065