facturas:
Merge branch 'master' of https://github.com/exprezzo/triples

Conflicts:
	core
	sistema/controladores/facturas.php
cambios en controlador factura
Merge branch 'master' of https://github.com/exprezzo/triples

Conflicts:
	core