Closes issue #1371 & #1370
Merge branch 'rc3' of https://github.com/ten24/Slatwall.git into rc3