Merge branch 'master' of https://github.com/inj0hn/PaymentsProdValidation

Conflicts:
	payments_harness.py
merge