asfd
Merge branch 'master' into kath

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

Change-Id: I93f0d1128dfd37d629666b1966ce25d25566a21d
Signed-off-by: lennin92 <lennin92@gmail.com>