Commit apos merge
Merge branch 'master' of
https://github.com/ccacsurf/sistemalaboratorio.git

Conflicts:
	src/main/webapp/WEB-INF/applicationContext.xml
	src/main/webapp/WEB-INF/faces-config.xml
	src/main/webapp/pages/carga.xhtml