Merge loro/master

Conflicts:
	ProjetoWeb2_Condominio/web/jsp/menu.jsp
Merge loro/master