Arreglos
Merge branch 'master' of https://github.com/XuUmSdBvOUZd4KtSNwzb/web

Conflicts:
	WEB-INF/Plantilla/plantilla.xhtml
	principal.xhtml