Ubicacion
conflictos
Merge branch 'master' of https://github.com/fwilchel/gip3

Conflicts:
	target/m2e-wtp/web-resources/META-INF/maven/com.ssl.jv.gip/gip3/pom.properties