cambios
Merge remote-tracking branch 'origin/master'

Conflicts:
	InventarioWeb.suo
	InventarioWeb/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache