Added fixes from Sumit
Merge branch 'develop-4' of https://github.com/ten24/Slatwall.git into develop-4