closing with new discount structure
Merge origin/etkeztetes into etkeztetes