calculate price and discount
Merge branch 'develop' of https://github.com/brb-at/geb into develop