Merge branch 'develop-4' of https://github.com/ten24/Slatwall into feature-4-uiexamples
Bundle create layout fix
Merge conficts
Bundle add - fix
Merge branch 'develop-4' of https://github.com/ten24/Slatwall into feature-4-uiexamples
Merge pull request #2533 from ten24/feature-4-uiexamples

Feature 4 uiexamples