Closes issue #1112 & #1120
Closes issue #1144
Merge branch 'rc3' of https://github.com/ten24/Slatwall.git into rc3