added discount sale and spesial proposition
Merge branch 'discount'