...
Merge branch 'master' of https://github.com/marmuel/ballin-spice

Conflicts:
	js/mylibs/script.js
	l10n/de_DE.json
...
Merge branch 'master' of https://github.com/marmuel/ballin-spice
reload page after reset localstorage
include discount in tax calculation
Check when the page loads, if shippingcosts entered or not