tese
Merge branch 'master' of https://github.com/MarcelloVSilva/PW_query

Conflicts:
	Documents/GitHub/PW/CompraFacil/target/m2e-wtp/web-resources/META-INF/maven/pw/pw-jsp-servlet/pom.properties