Creacion de Estado en la parte servidor
Creacion de Estado en la parte servidor
Gestion Publicacion basica en servidor
Merge origin/Victor into ArmandoMayaGomis

Conflicts:
	src/main/java/net/daw/control/JsonControl.java
Parte Servidor de Amigo
Parte Servidor de Amigo
Merge origin/master into david
Merge origin/master into david
Merge origin/ArmandoMayaGomis into david

Conflicts:
	src/main/java/net/daw/control/JsonControl.java
Merge origin/david into ArmandoMayaGomis

Conflicts:
	src/main/java/net/daw/control/JsonControl.java
Armando Cliente Publicacion parte1
Merge origin/ArmandoMayaGomis into ArmandoMayaGomis
Armando Publicacion cliente estandar terminado
Armando Publicacion cliente boton duplicate
Armando Servidor boton duplicate
Armando Publicacion arreglado metodo duplicate de service
Armando Servidor boton duplicate acabado
Merge master into ArmandoMayaGomis

Conflicts:
	src/main/java/net/daw/control/JsonControl.java
	src/main/java/net/daw/control/operation/generic/specific/implementation/PublicacionControlOperationGenSpImpl.java
	src/main/java/net/daw/control/route/generic/specific/implementation/PublicacionControlRouteGenSpImpl.java
	src/main/java/net/daw/service/generic/specific/implementation/PublicacionServiceGenSpImpl.java
	src/main/webapp/index.jsp
Armando arreglado tabla que sale al insertar nuevo en las claves ajenas
Merge master into ArmandoMayaGomis