Merge loro/master

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