lala
Merge remote-tracking branch 'origin/Admin-LCI-2.3'
Cambios pasados

creo que agregé todos los cambios que habia hecho o:
Nuevos cambios
Merge remote-tracking branch 'origin/master' into Admin-LCI-2.3

Conflicts:
	AdmLCI.v11.suo
	AdmLCI/PantallaPrincipal.cs
	AdmLCI/bin/Debug/AdmLCI.exe
	AdmLCI/bin/Debug/AdmLCI.pdb
	AdmLCI/bin/Debug/config.txt
	AdmLCI/obj/x86/Debug/AdmLCI.csproj.FileListAbsolute.txt
	AdmLCI/obj/x86/Debug/AdmLCI.csproj.GenerateResource.Cache
	AdmLCI/obj/x86/Debug/AdmLCI.csproj.ResolveComReference.cache
	AdmLCI/obj/x86/Debug/AdmLCI.exe
	AdmLCI/obj/x86/Debug/AdmLCI.pdb
	AdmLCI/obj/x86/Debug/RdlCompile.cache