Add product discount to price (modified)
Merge branch 'master' of https://github.com/dynamicweb/solutionset