Quote computation fixed when tax included in price
Merge branch 'develop'