Trying to fix Issue #1337 but have to pass it by Greg
Merge branch 'rc3' of https://github.com/ten24/Slatwall.git into rc3
closes Issue #1332 and Issue #1348
Merge branch 'rc3' of https://github.com/ten24/Slatwall.git into rc3