Conflicts:
	docs/source/releases/v0.6.rst
	docs/source/topics/key_questions.rst
	oscar/apps/basket/forms.py
	oscar/apps/catalogue/views.py
	oscar/apps/customer/views.py
	oscar/templates/oscar/basket/partials/basket_content.html
	oscar/templates/oscar/basket/partials/basket_quick.html
	oscar/templates/oscar/catalogue/partials/add_to_basket_form.html
	oscar/templates/oscar/catalogue/partials/add_to_basket_form_compact.html
	oscar/templates/oscar/catalogue/partials/product.html
	oscar/templates/oscar/checkout/checkout.html
	oscar/templates/oscar/customer/address_delete.html
	oscar/templates/oscar/customer/address_form.html
	oscar/templates/oscar/customer/address_list.html
	oscar/templates/oscar/customer/change_password_form.html
	oscar/templates/oscar/customer/email.html
	oscar/templates/oscar/customer/order_list.html
	oscar/templates/oscar/customer/profile.html
	oscar/templates/oscar/dashboard/catalogue/product_list.html
	oscar/templates/oscar/partials/nav_primary.html
	requirements.txt
	tests/functional/customer/profile_tests.py
	tests/integration/order/model_tests.py