actualització 49 classes
les meves propietats
canvi de branch
Merge branch 'master' of https://github.com/bhellin/smartrepair.git
actualitzacio classes desde el Repository
Merge branch 'master' of https://github.com/bhellin/smartrepair.git

Conflicts:
	pac4/bin/uoc/tdp/smartrepair/pac/properties/configuracion.properties
	pac4/src/uoc/tdp/smartrepair/pac/properties/configuracion.properties
canviant a pac
Merge branch 'master' of https://github.com/bhellin/smartrepair.git