Merge branch 'bugfix/discount-codes-without-uses' into feature/loyalty-discounts

Conflicts:
	cartridge/shop/managers.py
Merge branch 'feature/loyalty-discounts' into develop

Conflicts:
	cartridge/shop/managers.py