conflito
Merge branch 'master' of git@github.com:asamaximos/ExoticaCalcados.git

Conflicts:
	target/m2e-wtp/web-resources/META-INF/maven/Teste/Teste/pom.properties
Merge branch 'master' of git@github.com:asamaximos/ExoticaCalcados.git
Commit para Luiz