Merge remote-tracking branch 'origin/master' into MiniDump

src/Game/main.cpp

@@ -7,7 +7,9 @@ int main(int argc, char* argv[])
 
     Game game(argc, argv);
     while (game.Running()) {
+		PerformanceTimer::StartTimer("Game-Tick");
         game.Tick();
+		PerformanceTimer::StopTimer("Game-Tick");
     }
 
     return 0;