Refactor code
Fix label for shopping taxes screen
Merge branch 'develop' into feature/quantity-discount