Conflicts: oscar/apps/dashboard/catalogue/views.py oscar/apps/dashboard/partners/views.py oscar/apps/dashboard/reviews/views.py oscar/templates/oscar/dashboard/catalogue/product_list.html oscar/templates/oscar/dashboard/orders/order_list.html oscar/templates/oscar/dashboard/pages/index.html oscar/templates/oscar/dashboard/ranges/range_list.html oscar/templates/oscar/dashboard/reports/partials/open_basket_report.html oscar/templates/oscar/dashboard/reports/partials/order_report.html oscar/templates/oscar/dashboard/reports/partials/submitted_basket_report.html oscar/templates/oscar/dashboard/reports/partials/user_report.html