alteracao no cadastro de usuario
merge
ddd
bnbn
teste
Merge remote-tracking branch 'origin/master'

Conflicts:
	forum/derby.log
	forum/target/m2e-wtp/web-resources/META-INF/maven/ProjetoForumPW/Forum/pom.properties
	forum/target/tomcat/work/Tomcat/localhost/Forum/org/apache/jsp/CadastrarUsuario_jsp.class
	forum/target/tomcat/work/Tomcat/localhost/Forum/org/apache/jsp/CadastrarUsuario_jsp.java
	forum/target/tomcat/work/Tomcat/localhost/Forum/org/apache/jsp/index_jsp.java