Merge branch 'master' of https://github.com/RedepronikSystem/negosys

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