changes from code review
Merge branch 'feature-bs3-collections' of https://github.com/ten24/Slatwall into feature-bs3-collections
cfset instead of cfreturn
Merge branch 'feature-bs3-collections' of
https://github.com/ten24/Slatwall into feature-bs3-collections

Conflicts:
	admin/layouts/default.cfm
	model/service/UpdateService.cfc
	org/Hibachi/HibachiAssets/js/global.js
reverting conflict commit