Update README.rst
Update README.rst
Merge pull request #227 from jrief/accept-payment-on-backend

Accept payment on backend
Merge pull request #228 from jrief/travis-ci

Add support for Travis Continuos Integration
Added travis-ci build status to README
Merge branch 'master' of https://github.com/divio/django-shop into travis-ci
Added Travis-CI build status
Merge pull request #229 from jrief/travis-ci

Travis ci
Merge pull request #217 from jrief/cart_modifiers-fix-missing-state

Add state object to cart modifier methods get_extra_cart_price_field and get_extra_cart_item_price_field
Bumping changelog and version number for release.
Bumping version and CHANGELOG post-release.
get_extra_cart_price needs the request
make order of the items in the cart deterministic
Add missing french translations
Merge pull request #230 from aitzol/master

get_extra_cart_price_field needs the request
Merge pull request #233 from sephii/cart-items-order

make order of the items in the cart deterministic
Merge pull request #232 from sephii/fr-translations

Add missing french translations
Cart views sanitize inputs
Merge pull request #234 from atheiste/master

Cart views sanitize inputs
Make sure the checkout confirmation redirect is not a permanent one.

Permanent redirects may be cached by the browser or a reverse proxy, causing
the view to be ignored. The order status then won't get updated.