fixed issue #74
fix issue #77
add Customer taxes support to shipping prices
Merge remote-tracking branch 'upstream/master'