corregir el error
Merge branch 'master' of https://github.com/proyectosuia/Aerolineas

Conflicts:
	Aerolineas.UI/Aerolineas.UI.vbproj
	Aerolineas.UI/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache