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