teste merge
Merge branch 'master' of https://github.com/luizdona/cpa.git

Conflicts:
	cpa/WebContent/decorators/usuario_template.jsp