misc
Merge branch 'develop' into feature-paypalexpress
Merge branch 'develop' into feature-paypalexpress
Merge branch 'develop' into feature-paypalexpress
Merge branch 'develop' into feature-paypalexpress
Merge branch 'develop' into feature-paypalexpress
Updated Version 3.1.26.095
Merge branch 'develop' into develop-eventandbundle

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