Added demo classes for the ComponentHighlighter Addon. Adjusted
CustomLayout templates for the new Spring-based Templating Service.