Test1
Merge branch 'Laboratorio' of https://github.com/hansdelgado/gchCibertec into Laboratorio

Conflicts:
	src/main/java/pe/edu/cibertec/gch/web/servlets/laboratorio/RegistroLaboratorioServlet.java