diff --git a/oscar/templates/customer/profile-form.html b/oscar/templates/customer/profile-form.html
diff --git a/oscar/templates/customer/profile.html b/oscar/templates/customer/profile.html
diff --git a/oscar/templates/dashboard/catalogue/product_list.html b/oscar/templates/dashboard/catalogue/product_list.html
diff --git a/oscar/templates/dashboard/catalogue/product_update.html b/oscar/templates/dashboard/catalogue/product_update.html
diff --git a/oscar/templates/dashboard/catalogue/stockalert_list.html b/oscar/templates/dashboard/catalogue/stockalert_list.html
diff --git a/oscar/templates/dashboard/index.html b/oscar/templates/dashboard/index.html
diff --git a/oscar/templates/dashboard/layout.html b/oscar/templates/dashboard/layout.html
diff --git a/oscar/templates/dashboard/offers/benefit_form.html b/oscar/templates/dashboard/offers/benefit_form.html
diff --git a/oscar/templates/dashboard/offers/condition_form.html b/oscar/templates/dashboard/offers/condition_form.html
diff --git a/oscar/templates/dashboard/offers/metadata_form.html b/oscar/templates/dashboard/offers/metadata_form.html
diff --git a/oscar/templates/dashboard/offers/offer_delete.html b/oscar/templates/dashboard/offers/offer_delete.html
diff --git a/oscar/templates/dashboard/offers/offer_detail.html b/oscar/templates/dashboard/offers/offer_detail.html
diff --git a/oscar/templates/dashboard/offers/offer_list.html b/oscar/templates/dashboard/offers/offer_list.html
diff --git a/oscar/templates/dashboard/offers/preview.html b/oscar/templates/dashboard/offers/preview.html
diff --git a/oscar/templates/dashboard/offers/step_form.html b/oscar/templates/dashboard/offers/step_form.html
diff --git a/oscar/templates/dashboard/orders/line_detail.html b/oscar/templates/dashboard/orders/line_detail.html
diff --git a/oscar/templates/dashboard/orders/order_detail.html b/oscar/templates/dashboard/orders/order_detail.html
diff --git a/oscar/templates/dashboard/orders/order_list.html b/oscar/templates/dashboard/orders/order_list.html
diff --git a/oscar/templates/dashboard/orders/shippingaddress_form.html b/oscar/templates/dashboard/orders/shippingaddress_form.html
diff --git a/...r/templates/dashboard/orders/summary.html → ...emplates/dashboard/orders/statistics.html b/...r/templates/dashboard/orders/summary.html → ...emplates/dashboard/orders/statistics.html
diff --git a/oscar/templates/dashboard/pages/index.html b/oscar/templates/dashboard/pages/index.html
diff --git a/oscar/templates/dashboard/pages/update.html b/oscar/templates/dashboard/pages/update.html
diff --git a/oscar/templates/dashboard/promotions/delete.html b/oscar/templates/dashboard/promotions/delete.html
diff --git a/oscar/templates/dashboard/promotions/form.html b/oscar/templates/dashboard/promotions/form.html
diff --git a/oscar/templates/dashboard/promotions/pagepromotion_list.html b/oscar/templates/dashboard/promotions/pagepromotion_list.html
diff --git a/oscar/templates/dashboard/promotions/promotion_list.html b/oscar/templates/dashboard/promotions/promotion_list.html
diff --git a/oscar/templates/dashboard/reports/index.html b/oscar/templates/dashboard/reports/index.html
diff --git a/oscar/templates/dashboard/users/detail.html b/oscar/templates/dashboard/users/detail.html
diff --git a/oscar/templates/dashboard/users/index.html b/oscar/templates/dashboard/users/index.html
diff --git a/oscar/templates/layout.html b/oscar/templates/layout.html
diff --git a/oscar/templates/layout_2_col.html b/oscar/templates/layout_2_col.html
diff --git a/oscar/templates/layout_3_col.html b/oscar/templates/layout_3_col.html
diff --git a/oscar/templates/partials/extrascripts.html b/oscar/templates/partials/extrascripts.html
diff --git a/oscar/templates/partials/form_fields.html b/oscar/templates/partials/form_fields.html
diff --git a/oscar/templates/partials/form_fields_inline.html b/oscar/templates/partials/form_fields_inline.html
diff --git a/oscar/templates/partials/nav_alternate.html b/oscar/templates/partials/nav_alternate.html
diff --git a/oscar/templates/partials/nav_checkout.html b/oscar/templates/partials/nav_checkout.html
diff --git a/oscar/templates/partials/nav_primary.html b/oscar/templates/partials/nav_primary.html
diff --git a/oscar/templates/promotions/home.html b/oscar/templates/promotions/home.html
diff --git a/oscar/templates/promotions/layout.html b/oscar/templates/promotions/layout.html
diff --git a/oscar/templates/promotions/partials/product_carousel.html b/oscar/templates/promotions/partials/product_carousel.html
diff --git a/oscar/templates/reviews/_vote_bit.html b/oscar/templates/reviews/_vote_bit.html
diff --git a/oscar/templates/reviews/add_review.html b/oscar/templates/reviews/add_review.html
diff --git a/oscar/test/__init__.py b/oscar/test/__init__.py
diff --git a/oscar/test/helpers.py b/oscar/test/helpers.py
diff --git a/oscar/tests.py b/oscar/tests.py
diff --git a/oscar/views/__init__.py b/oscar/views/__init__.py
diff --git a/oscar/views/generic.py b/oscar/views/generic.py
diff --git a/pre-commit.sh b/pre-commit.sh
diff --git a/run_tests.py b/run_tests.py
diff --git a/sandbox/apps/shipping/migrations/0002_auto__add_field_weightbased_default_weight.py b/sandbox/apps/shipping/migrations/0002_auto__add_field_weightbased_default_weight.py
diff --git a/sandbox/apps/user/__init__.py b/sandbox/apps/user/__init__.py
diff --git a/sandbox/apps/user/models.py b/sandbox/apps/user/models.py
diff --git a/sandbox/recreate_db.sh b/sandbox/recreate_db.sh
diff --git a/sandbox/settings.py b/sandbox/settings.py
diff --git a/sandbox/update_build.sh b/sandbox/update_build.sh
diff --git a/sandbox/urls.py b/sandbox/urls.py
diff --git a/setup.py b/setup.py
diff --git a/testing-reqs.txt b/testing-reqs.txt
diff --git a/tests/apps/__init__.py b/tests/apps/__init__.py
diff --git a/tests/apps/shipping/__init__.py b/tests/apps/shipping/__init__.py
diff --git a/tests/apps/shipping/methods.py b/tests/apps/shipping/methods.py
diff --git a/tests/apps/shipping/models.py b/tests/apps/shipping/models.py
diff --git a/tests/config.py b/tests/config.py