cambios
Merge remote-tracking branch 'origin/master'

Conflicts:
	BE-COM/UI/bin/Debug/UI1.exe.config
	BE-COM/UI/bin/Debug/UI1.vshost.exe.config
	BE-COM/UI/obj/Debug/UI.vbproj.FileListAbsolute.txt