Hotfix for payment integration updates
Updated Version 3.1.1
Merge branch 'master' into develop

Conflicts:
	version.txt
Merge branch 'develop' into feature-collections