Mantenimiento cliente pregunta (cris)
Merge origin/master into david
Mantenimiento cliente pregunta (cris)
Merge javier/master into javier

Conflicts:
	src/main/java/net/daw/control/JsonControl.java
	src/main/webapp/index.jsp
	src/main/webapp/jsp/menuLateral.jsp
	src/main/webapp/jsp/menuSuperior.jsp
Merge javier/master into javier

Conflicts:
	src/main/java/net/daw/control/JsonControl.java
	src/main/webapp/index.jsp
	src/main/webapp/jsp/menuLateral.jsp
	src/main/webapp/jsp/menuSuperior.jsp
Merge pull request #14 from jassman/master

Integracion Mantenimineto Cuestionario
Merge origin/master

Conflicts:
	src/main/webapp/index.jsp
controloperation private 2 protected
Merge pull request #15 from davidcharles747/master

Integración mantenimiento tabla Amigo de RedSocial
Merge rafa/master