Workaround hotfix Closes #992
Merge branch 'master' into develop

Conflicts:
	version.txt
Actually fixes #992, closes #996, adds support for payment transactions
to be tied to deliveries.
Merge branch 'master' into develop

Conflicts:
	version.txt
Frontend fulfillment hotfix (thanks Dan!)
Merge branch 'master' into develop

Conflicts:
	version.txt
Order Promotion Discount Bugfix
Merge branch 'master' into develop

Conflicts:
	version.txt
Custom attribute population bugfix.  Thanks Dan!
Hotfix that Closes #1004
Merge branch 'master' into develop

Conflicts:
	version.txt
Bugfix with the attribute value population
Hotfix for old style of coldspring integration.
Merge branch 'master' into develop

Conflicts:
	version.txt
changed create object to entityNew in utilityORM service
Adds delivery items back on develop
Merge branch 'develop' of https://github.com/ten24/Slatwall.git into develop
Fixes bug in UtilityORMService that was originally made on develop.
Merge branch 'master' into develop

Conflicts:
	com/service/UtilityORMService.cfc
	version.txt
Hotfix when removing orderItems that don't have fulfillments assigned.