Announce event before and after updateOrderAmountsWithPromotions
Removed commented code on line 133
Merge branch 'develop' of https://github.com/ten24/Slatwall.git into feature-updateOrderAmountsWithPromotions
changed processOrder name, took the logic in recalculateOrderAmount(),
added a return entity, called processOrder throughout application
a few paypal express fixes and addition of line item details to show on left hand navigation of paypal checkout
updating default payment method id to be blank
Updated Version 3.1.64.152
Merge remote-tracking branch 'origin/feature-updateOrderAmountsWithPromotions' into develop
Updated Version 3.1.64.153
Created Unit Tests for CC Validation, and fixed bug in mod10 logic
Language UI
Merge remote-tracking branch 'origin/feature-frProperties' into feature
Removed unneeded files from the flags library, and made some minor UI
tweeks.
Forces a session to be persisted if a user changes the language of the
admin.
Updated Version 3.1.64.154
Updated Version 3.2.000
Updated Version 3.2.000.001
Merge branch 'develop' into develop-3_3

Conflicts:
	admin/controllers/main.cfc
	config/resourceBundles/en.properties
	model/service/OrderService.cfc
	org/Hibachi/HibachiValidationService.cfc
	version.txt