updated merge changes

Author: StephenHodgson

Assets/MixedRealityToolkit-SDK/Features/Input/Handlers/DragAndDropHandler.cs

@@ -135,7 +135,7 @@ void IMixedRealityPointerHandler.OnPointerDown(MixedRealityPointerEventData even
             currentPointer = eventData.Pointer;
 
             FocusDetails focusDetails;
-            Vector3 initialDraggingPosition = MixedRealityManager.InputSystem.FocusProvider.TryGetFocusDetails(currentPointer, out focusDetails)
+            Vector3 initialDraggingPosition = MixedRealityToolkit.InputSystem.FocusProvider.TryGetFocusDetails(currentPointer, out focusDetails)
                     ? focusDetails.Point
                     : hostTransform.position;
 
@@ -201,7 +201,7 @@ private void StartDragging(Vector3 initialDraggingPosition)
             // TODO: robertes: Fix push/pop and single-handler model so that multiple HandDraggable components can be active at once.
 
             // Add self as a modal input handler, to get all inputs during the manipulation
-            MixedRealityManager.InputSystem.PushModalInputHandler(gameObject);
+            MixedRealityToolkit.InputSystem.PushModalInputHandler(gameObject);
 
             isDragging = true;
 
@@ -327,7 +327,7 @@ private void StopDragging()
             }
 
             // Remove self as a modal input handler
-            MixedRealityManager.InputSystem.PopModalInputHandler();
+            MixedRealityToolkit.InputSystem.PopModalInputHandler();
 
             isDragging = false;