Merge origin/master into victor

Conflicts:
	src/main/webapp/index.jsp
	src/main/webapp/jsp/menuLateral.jsp
	src/main/webapp/jsp/menuSuperior.jsp