Allow whitespace in the template controller URL syntax
Reenable test for metamodel and add a test for metamodel cycle detection
Fix transitivity non implemented when resolving assets
[maven-release-plugin] prepare release 0.7.0-beta18
[maven-release-plugin] prepare for next development iteration
Improved the template meta model for handling templates referenced by other templates and not by java elements
Make nested decorate tag work
Use <link/> instead of <link></link>
[maven-release-plugin] prepare release 0.7.0-beta19
[maven-release-plugin] prepare for next development iteration
Fix bug when a template references more than one template
Merge remote-tracking branch 'upstream/master'

merge