Treballant en Classes GestorX
Treballant en Gestors Beans
Merge branch 'master' of https://github.com/bhellin/smartrepair

Conflicts:
	pac4/src/uoc/tdp/smartrepair/pac/beans/Peca.java
	pac4/src/uoc/tdp/smartrepair/pac/servidor/bbdd/ClientBD.java
	pac4/src/uoc/tdp/smartrepair/pac/servidor/bbdd/GestorUsuaris.java
	pac4/src/uoc/tdp/smartrepair/pac/servidor/bbdd/bdDef.properties
Manteniment
Manteniment