Fixes issues with making sure that credit card numbers get encrypted
when the payment method is flagged as such.
Fixes extra space in outputs
Fixed and verified encryption, as well as an authentication fix.
Updated Version 3.1.25
Merge branch 'master' into develop

Conflicts:
	version.txt