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

Conflicts:
	pac4/src/uoc/tdp/smartrepair/pac/servidor/bbdd/bdDef.properties