de nuevo
Merge branch 'master' of https://github.com/jose28gena/AdmLCIv2.2

Conflicts:
	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.csprojResolveAssemblyReference.cache
	AdmLCI/obj/x86/Debug/AdmLCI.exe
	AdmLCI/obj/x86/Debug/AdmLCI.pdb