Merge origin/master

Conflicts:
	src/main/webapp/WEB-INF/templates/plantilla.xhtml
Merge origin/master

Conflicts:
	src/main/webapp/WEB-INF/templates/plantilla.xhtml
Merge origin/master