comit antes de integrar todo
Merge origin/master

Conflicts:
	GCamas-web/src/main/webapp/Reportes/resultHospitalizados.xhtml
Merge origin/master

Conflicts:
	GCamas-web/src/main/webapp/Reportes/resultHospitalizados.xhtml