Updated Version
Merge branch 'master' into develop

Conflicts:
	version.txt
Added a billToLocation
Closes #984
Attribute Set Bugfix
Merge branch 'master' into develop

Conflicts:
	version.txt
Merge branch 'master' into develop

Conflicts:
	version.txt
Merge branch 'master' into develop

Conflicts:
	version.txt
Merge branch 'master' into develop

Conflicts:
	version.txt
Merge branch 'master' into develop

Conflicts:
	version.txt
Custom attribute population bugfix.  Thanks Dan!
Merge branch 'master' into develop

Conflicts:
	version.txt
Bugfix with the attribute value population
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
Merge branch 'master' into develop

Conflicts:
	com/service/UtilityORMService.cfc
	version.txt
Merge branch 'master' into develop

Conflicts:
	version.txt
Merge branch 'master' into develop

Conflicts:
	version.txt