cambio de paquete
Merge branch 'master' of https://github.com/jose1988/srcAnalistas

Conflicts:
	java/META-INF/GestionDeUsuarios.xml