Trying to troubleshoot physical commits
Merge branch 'rc3' of https://github.com/ten24/Slatwall.git into rc3

Conflicts:
	model/service/StockService.cfc
debugging physical commit
Merge branch 'rc3' of https://github.com/ten24/Slatwall.git into rc3