static resources version
tolto tag aimedia
tolto versionamento risorse da master
fix meta
Merge branch 'master' into new-menu

Conflicts:
	src/main/webapp/jnt_template/html/template.zegna-template.jsp