ensuring that shipping discount is never greater than the actual shipping cost, fixes #103
Merge branch 'master' of github.com:dioscouri/f3-shop