Merge origin/master into Jose

Conflicts:
	src/main/java/net/daw/control/JsonControl.java
	src/main/webapp/jsp/menuLateral.jsp
Merge origin/master into Jose

Conflicts:
	src/main/java/net/daw/control/JsonControl.java
	src/main/webapp/jsp/menuLateral.jsp
Merge origin/master into Jose
Merge origin/master into Jose

Conflicts:
	src/main/java/net/daw/control/JsonControl.java
	src/main/webapp/jsp/menuLateral.jsp
Merge origin/master into Jose

Conflicts:
	src/main/java/net/daw/control/JsonControl.java
	src/main/webapp/jsp/menuLateral.jsp
Merge origin/master into Jose

Conflicts:
	src/main/java/net/daw/control/JsonControl.java
	src/main/webapp/jsp/menuLateral.jsp