Enhance the "save review" button
Be explicit about safe text for flash messages

Ensure all HTML messages are called with the same tags.
Add new tests for fixed discount offer with count condition

Testing a query raised in this thread:
https://groups.google.com/forum/?utm_medium=email&utm_source=footer#!msg/django-oscar/vceEpy889O4/OBzt6p9rsywJ
Fix typos and make code example valid Python
Merge pull request #1415 from merwok/patch-2

Fix typos and make code example valid Python
Docs: Code fixes, highlighting and typos

This is the squashed version of #1369.

Closes #1369.
Used get_username() instead of referencing the username attribute directly
Drop unused OSCAR_BASKET_COOKIE_SAVED setting

It must be left over from more glorious times.
get_cookie_key method for BasketMiddleware for multi-sites

In a multi-site scenario, one might want different cookie baskets
per site. In that case, an easy way to achieve this is to set different
cookie keys per site. The introduced method provides an easy hook to do
just that.
Add docstring for product validation

I created this table to get my head around the product validation, and
figured it's probably useful for others.
Merge pull request #1418 from oscaro/fix/username

Used get_username() instead of referencing the username attribute
Simplify shipping template tags

This commit simplifies yet another set of template tags by using
Django's helpers.

Closes #1419.
Make it optional to redirect to the parent

Fixes #1420
Rename template references to variants

Where I previously thought that renaming HTML/CSS is more hassle than
it's worth, @mbertheau convinced me that to update a codebase, a general
search-and-replace is the best approach already and will catch any
HTML/CSS changes.

I also missed to deprecate the min_variant_price properties.
Ignore capitalisation of local part of email address

Most email servers don't respect capitalisation, and many users don't
know about it. So Oscar now does what the rest of the world does, and
ignores the capitalisation when looking up an email address.

Fixes #1179.
Correct import path

A gremlin spawned in 860fab7ba770dbaf12564ec8434b65323e616ae1. This was
bringing down the sandbox site.
Add robots.txt files to latest/demo sites
Ensure only signed-in users can vote

Not sure how this bug has survived this long - it was well masked as the
template will hide voting buttons for unauthenticated users.
Correct proxy IP in nginx config
Merge branch 'master' into fix/1411_fedissues

Conflicts:
	oscar/templates/oscar/catalogue/reviews/review_form.html