Serveis
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/libraries/support_v4_19_0_1.xml
	.idea/vcs.xml
	gestioClients/src/main/java/com/serviapps/gestioclients/Cliente_ConsultarEditar_Activity.java
	gestioClients/src/main/java/com/serviapps/gestioclients/CrearBD.java
	gestioClients/src/main/java/com/serviapps/gestioclients/Servicio.java
	gestioClients/src/main/java/com/serviapps/gestioclients/Servicio_ConsultarEditar_Activity.java
	gestioClients/src/main/java/com/serviapps/gestioclients/Servicio_Crear_Activity.java
	gestioClients/src/main/res/layout/cliente_consultar_editar.xml
	gestioClients/src/main/res/layout/servicio_crear.xml
	gestioClients/src/main/res/layout/servicio_listitem.xml
Serveis
Serveis