prueba
Merge branch 'master' of https://github.com/Leidgam/LKS-I_JP2M.git

Conflicts:
	AllProyect/impr/WebContent/ventas/ped_insert.jsp