Merge branch 'release/v1.17'
Made transactions unique
Merge branch 'hotfix/PaymentUniq' into develop

Conflicts:
	src/main/php/paying.php