Improved the template meta model for handling templates referenced by other templates and not by java elements
Make nested decorate tag work