FIX: #213 Deleting cart item view should not raise an error
Merge branch 'fix-213-deleting-cart-item' of https://github.com/bmihelac/django-shop into bmihelac-fix-213-deleting-cart-item

Conflicts:
	shop/views/cart.py
Merge branch 'master' of github.com:divio/django-shop