Add DiscountItem
Merge branch 'add-discount-items' into production