Merge remote-tracking branch 'origin/master'

Conflicts:
	Mathias Muller Examen Parcial
I/BLL/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	Mathias Muller Examen Parcial
I/DAL/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	Mathias Muller Examen Parcial
I/EntitiesLayer/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	Mathias Muller Examen Parcial I/Mathias Muller Examen Parcial
I/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	Mathias Muller Examen Parcial I/Mathias Muller Examen Parcial
I/obj/Debug/IU.vbproj.FileListAbsolute.txt