Merge pull request #1 from diefenbach/master

Update from original
Add missing discount tax in cart
Merge pull request #155 from jzuschlag/master

Add missing discount tax in cart
trigger cart updated event on add accessory to cart
add tag to render addresses with type
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' of github.com:pigletto/django-lfs
fix tag for address rendering
Merge remote-tracking branch 'upstream/master'
fix ValueError on max([]) when there are no cart items
Merge remote-tracking branch 'upstream/master'
Merge branch 'master' into content_translations