Facturacion Entrada y CC juntos
Merge branch 'master' of https://github.com/Uccart/UCCART

Conflicts:
	UCCART_JPA/src/model/Empleado_.java
	UCCART_JPA/src/model/FacturaEntrada_.java