Merge remote-tracking branch 'origin/master'
Merge branch 'master' of https://github.com/bhellin/smartrepair.git
Merge branch 'master' of https://github.com/bhellin/smartrepair.git

Conflicts:
	pac4/.classpath
	pac4/bin/uoc/tdp/smartrepair/pac/properties/configuracion.properties
	pac4/src/uoc/tdp/smartrepair/pac/properties/configuracion.properties
	pac4/src/uoc/tdp/smartrepair/pac/servidor/bbdd/GestorReparacions.java
	pac4/src/uoc/tdp/smartrepair/pac/subs3reparacions/PantallaGestioReparacions.java