minor fixes
Merge branch 'master' into develop

Conflicts:
	shopping_cart/templates/utils.py
bumped to version 0.4.0
Merge branch 'develop'