Merge origin/Federico into Federico

Conflicts:
	src/main/webapp/index.xhtml
	src/main/webapp/template/template.xhtml