Fixing or statement
Merge branch 'master' of https://github.com/explodes/cartridge-payments

Conflicts:
	payments/multipayments/forms/base.py