Changed tiles template
Merged branch master with a good version of tiles-templates.xml.