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
Added option to select exchange order type from return process
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
Added Tax & Payment Transaction Reports, plus renamed the sales &
promotion reports
Added additional columns to the OrderItemReport
Added type
Closes #1899
Updated Version 3.1.12
Merge branch 'master' into develop

Conflicts:
	version.txt
Merge branch 'develop' into develop-reporting
Fixes issue with first skuCode added to a new subscription product. 
Also makes adding subscriptionSkus more flexible.
Updated Version 3.1.12.009
Merge branch 'develop' into develop-reporting
Added some reporting updates to the payment transaction report.
Updated Version 3.1.12.010