Atualiza versão para resolver conflito
Merge branch 'master' of https://github.com/JulianFernando/gsan.git

Conflicts:
	gcom/jsp/util/rodape.jsp