Merge branch 'hotfix/fix_ecommerce_tracking'
Fix for bad math; addition of description to receipts
Merge branch 'hotfix/fix_ecommerce_part_ii' into develop