Discount Offers modified
Merge branch 'master' into master_v2