Closes #1170 & #1167
Merge branch 'rc3' of https://github.com/ten24/Slatwall.git into rc3