Merge origin/master

Conflicts:
	src/main/webapp/js/main.js
	src/main/webapp/jsp/menuLateral.jsp