Fixed main views
Merge branch 'develop-4' of https://github.com/ten24/Slatwall.git into feature-4-newHeaderHTMLStructure
Update added as well
Merge pull request #2517 from ten24/feature-4-newHeaderHTMLStructure

Feature 4 new header html structure