Fixes a couple small issues with providerTokens used in payment
processing
Updated Version 3.1.11
Merge branch 'master' into develop

Conflicts:
	version.txt
Token Updates
Updated the providerToken logic
Added extra views to get more payment information, and cleaned up
orbital so that it works correctly with generateToken
Updated Version 3.1.11.008
Closes #1899
Updated Version 3.1.12
Merge branch 'master' into develop

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