removed wildcard.foldercontents
Merge branch 'plone5' into themeswitcher
Initial skeleton of new implementation of session-based Diazo-skin switcher