Cambios ruta
Merge remote-tracking branch 'origin/victor' into victor

Conflicts:
	Applace/src/com/retni/applacegps/Logueado.java