Fixes bug with manual override of fulfillment amount during admin order
entry.
Merge branch 'master' into hotfix
Updated Version 3.0.16
Hotfix for orders that had failed payment transactions that were then
cleared.
Hotfix for removing promotion codes on the legacy frontend
Merge branch 'master' into hotfix
Updated Version 3.0.17
Merge branch 'master' into develop

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