-Factura
Merge branch 'master' of https://github.com/ciniguez/PFM.git

Conflicts:
	src/pfm/entidades/Factura.java