After POST data, check session for checkout step.
Keep step in session data up-to-date.
Handle exception when "order" isn't in session.
Merge remote-tracking branch 'upstream/master' into checkout_step_discovery
Forget checkout step when user POSTs to cart.
Remove all use of django.conf.urls.defaults since we don't support Django 1.3 anymore.
Merge remote-tracking branch 'upstream/master' into checkout_step_discovery
Forget checkout step every time the cart is shown.
Set session modified flag when remembering checkout step.
Added www.kisanhub.com to sites in README.
Forget checkout step only when creating new cart.
Show "Return to Checkout" if checkout in progress.
Merge
Make shop templates extend shop/base.html.

The change allows a site to supply shop-specific base.html, potentially
overriding or extending the global base.html.
Add SHOP_USE_RATINGS (default True), allowing ratings to be disabled.
Added Mike Wakerly to AUTHORS.
Merge
Merge
Remove deprecated ADMIN_MEDIA_PREFIX.
Use Django's timezone support since Django 1.3 is not supported.