hgth
Merge remote-tracking branch 'origin/master'

Conflicts:
	negosys/src/main/webapp/views/facturacion/factura.xhtml