agreagado boton
Merge branch 'alfredo' of https://github.com/pabloalfredo/Puntodeventa
into alfredo

Conflicts:
	SistemaDeVenta/src/Formularios/frmTipoProducto.java