Manteniment
Manteniment
Manteniment
Merge branch 'master' of https://github.com/bhellin/smartrepair

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