as
a
s



Change-Id: Ie151a52898e8dccd3a1f821005d6c258ceb7fab8
Signed-off-by: lennin92 <lennin92@gmail.com>
Merge remote-tracking branch 'origin/master' into kath

Conflicts:
	WebContent/TipoVta/eliminar.html
	WebContent/TipoVta/insertar.jsp
	WebContent/prueba.html