Base de datos, Agus

Base de datos, Agus
Merge remote-tracking branch 'origin/master'

Conflicts:

	WImplementacion/SATO/Negocio/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	WImplementacion/SATO/SATO.suo

	WImplementacion/SATO/SATO/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache