Closes #1557 and working on Display Toggle
Closes #1588
Wrapped up bug fixes for Display Toggle
Merge branch 'rc3' of https://github.com/ten24/Slatwall.git into rc3