Many fixes on discounts
Merge branch 'master' of github.com:webtsys/shop

Conflicts:
	i18n/en-US/shop.php
	i18n/es-ES/shop.php