Prueba
Merge branch 'master' of https://github.com/sebastianlorenzo/pascalSupera

Conflicts:
	Jatrik/target/m2e-wtp/web-resources/META-INF/maven/Jatrik/Jatrik/pom.properties
Login con parametros