alterações dido
Merge branch 'master' of https://github.com/didodometal/RetroPatio

Conflicts:
	RetroPatio/WebContent/default.jsp
	RetroPatio/WebContent/index.jsp