Merge branch 'master' into issue/341/wishlists

Conflicts:
	docs/source/ref/settings.rst
	oscar/apps/address/forms.py
	oscar/apps/customer/forms.py
	oscar/apps/customer/views.py
	oscar/apps/dashboard/catalogue/forms.py
	oscar/apps/dashboard/catalogue/views.py
	oscar/apps/dashboard/promotions/forms.py
	oscar/templates/oscar/catalogue/partials/add_to_basket_form.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/email_list.html
	oscar/templates/oscar/customer/notifications/list.html
	oscar/templates/oscar/customer/order/order_detail.html
	oscar/templates/oscar/customer/order_list.html
	oscar/templates/oscar/customer/profile.html
	oscar/templates/oscar/customer/profile_form.html
	oscar/templates/oscar/layout.html
	oscar/templates/oscar/partials/nav_accounts.html
	oscar/templates/oscar/partials/nav_profile.html
	tests/functional/customer/profile_tests.py
Reorder views in customer/views.py

This was done as part of the refactoring, but left out to ease the merge
commit. This commit does not change any code, just switches the order of
the views around.
Make wishlists app compatible with Django 1.5

The templates were switched to the new {% url %} syntax as part of the
merge commit.
Fix odd bug in tests

This was a code change introduced in the refactoring, but does not make
any sense. Luckily, it also caused the tests to fail, so I'm happy to
revert it.
Update tests for re-arranged order views

The locations of the form to re-order an order has changed, so the tests
needed updating.