Added discount info to email
Added subscription discount to product total calculation
Merge branch 'master' into feat-referral-system