Merge conflict

SHADE_Managed/src/Engine/Time.cxx

@@ -34,6 +34,7 @@ namespace SHADE
     float Time::DeltaTimeF::get()
     {
       return static_cast<float>(SHFrameRateController::GetRawDeltaTime());
+    }
     double Time::FixedDeltaTime::get()
     {
         return SHPhysicsSystemInterface::GetFixedDT();

SHADE_Managed/src/Engine/Time.hxx

@@ -41,6 +41,7 @@ namespace SHADE
         static property float DeltaTimeF
         {
           float get();
+        }
         /// <summary>
         /// Time taken for Physics simulations. You should use this for operations 
         /// within Script.FixedUpdate()