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.
Merge branch 'fix-partner-migrations' into machtfit

* branch fix-partner-migrations:
  Update migration to include PartnerAddress model.
Merge branch 'dashboard-partner-allow-not-only-staff' into machtfit

* branch dashboard-partner-allow-not-only-staff:
  Pre-select partner if only one is available and remove empty option
  Require at least one stock record for partner dashboard users
  Restrict stock record editing to the current user's partners if not is_staff
  Allow non-staff users to be associated with a partner.
  Fix whitespace.
Merge branch 'template-customization' into machtfit

* branch template-customization:
  Add blocks to make template customization easier
  Allow easier customization of partners dashboard
Merge branch 'dashboard-timepicker' into machtfit

* branch dashboard-timepicker:
  Apply the timepicker to time fields.
Merge branch 'product-image-upload-show-errors' into machtfit

* branch product-image-upload-show-errors:
  Show error messages on the ImageField itself.
Merge branch 'informa/issue/751/product-details' into machtfit

* branch informa/issue/751/product-details:
  #751 added FED fix for product update column stacking issue

Conflicts:
	oscar/templates/oscar/dashboard/catalogue/product_update.html