Update CHANGELOG.rst
switch to dev version
Merge branch 'master' of github.com:divio/django-shop
added a new property to product, which is checked before adding it to the cart
added test case for adding inactive product
fixed old tests to use active products
updated changelog
Merge pull request #204 from alesdotio/master

Fixes inactive products being able to be added to the cart
Merge remote-tracking branch 'origin' into futuribles

Conflicts:
	CHANGELOG.rst