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