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

Conflicts:
	pac4/src/uoc/tdp/smartrepair/pac/common/GestorServiciosInterface.java
	pac4/src/uoc/tdp/smartrepair/pac/models/TableUsuaris.java
	pac4/src/uoc/tdp/smartrepair/pac/servidor/RmiSubs1Impl.java
	pac4/src/uoc/tdp/smartrepair/pac/servidor/RmiSubs2.java
	pac4/src/uoc/tdp/smartrepair/pac/servidor/dao/AbsDAO.java
	pac4/src/uoc/tdp/smartrepair/pac/servidor/dao/ConexionDAO.java
	pac4/src/uoc/tdp/smartrepair/pac/servidor/dao/ExcepcionConexionDAO.java
	pac4/src/uoc/tdp/smartrepair/pac4/subs1conexio/Client.java
	pac4/src/uoc/tdp/smartrepair/pac4/subs1conexio/MenuAdministradorSistema.java
	pac4/src/uoc/tdp/smartrepair/pac4/subs1conexio/MenuAdministratiu.java
	pac4/src/uoc/tdp/smartrepair/pac4/subs1conexio/MenuCapTaller.java
	pac4/src/uoc/tdp/smartrepair/pac4/subs1conexio/MenuOperari.java
	pac4/src/uoc/tdp/smartrepair/pac4/subs1conexio/PantLogin.java
	pac4/src/uoc/tdp/smartrepair/pac4/subs1conexio/pantCambioPassw.java