Merge branch 'feature/configurable-products' into workaround/wishlist-cookie-gunicorn-unicode-error
A rough workaround for the gUnicorn UnicodeDecodeError due to wishlist cookie set on redirect.

Conflicts:

	cartridge/shop/views.py
Merge branch 'workaround/wishlist-cookie-gunicorn-unicode-error' into develop