Hotfix for typo in promotion reward permissions
Merge branch 'hotfix'
Updated Version 3.2.032
Merge branch 'master' into develop

Conflicts:
	version.txt
Added allowSaveFlag
Merge remote-tracking branch 'origin/hotfix-accountPaymentError' into develop
Updated Version 3.2.032.028
Adds logic for creditOffline and receiveOffline
Updated Version 3.2.032.029
Report Table Displays incraments of 20
Set default back to 25
Test case fixes
Merge remote-tracking branch 'origin/feature-reportDisplayTwentyRecords' into develop
Updated Version 3.2.032.030
Merge branch 'develop' into feature
Fixes bugs in delivery confirmation template
Cleaned up the order delivery template
Bugfix in the default payment method data.
Updated Version 3.2.032.031
Working on AttributeValue auditing