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