Implemented better parsing of attribute value templates
Merge branch 'master' into RendererGenerators
WiP