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

Conflicts:
	pac4/src/uoc/tdp/smartrepair/pac/client/ObjectesRemots.java
	pac4/src/uoc/tdp/smartrepair/pac/subs1conexio/ClientCon.java
	pac4/src/uoc/tdp/smartrepair/pac/subs1conexio/MenuCapTaller.java