Added global audit settings
Changed delivery creation to not be a modal window
Added credit card check when processing delivery
Updated comments and removed debugging code
changes to maintain all data in canceled order
comment cleanup
Merge remote-tracking branch 'origin/feature-captureOrderFulfillment' into develop
Updated Version 3.2.023.016
Merge remote-tracking branch 'origin/feature-cancelorderupdates' into develop
Updated Version 3.2.023.017
Updated the logic so that sku listing doesn't give incorrect counts.
Updated Version 3.2.024
Merge branch 'master' into develop

Conflicts:
	version.txt
Working on fixes for PayPal Express
Fixes populate function to check the existing object before going to the
DB
Updated Version 3.2.025
Merge branch 'master' into develop

Conflicts:
	version.txt
Added a fix that will call updateOrderAmounts everytime user logs in
Added Conditionals to optimize
Changed not to !