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

# Conflicts:
#	include/Engine/Rendering/RenderQueueFactory.h

src/Game/Game.cpp

@@ -54,8 +54,7 @@ Game::Game(int argc, char* argv[])
     m_SystemPipeline = new SystemPipeline(m_EventBroker);
     m_SystemPipeline->AddSystem<RaptorCopterSystem>();
     m_SystemPipeline->AddSystem<PlayerSystem>();
-
-
+    m_SystemPipeline->AddSystem<EditorSystem>();
 
     m_LastTime = glfwGetTime();
 
@@ -70,6 +69,8 @@ Game::~Game()
 
 void Game::Tick()
 {
+    glfwPollEvents();
+
     double currentTime = glfwGetTime();
     double dt = currentTime - m_LastTime;
     m_LastTime = currentTime;
@@ -81,7 +82,6 @@ void Game::Tick()
     m_EventBroker->Swap();
     m_InputProxy->Update(dt);
     m_EventBroker->Swap();
-    m_EventBroker->Clear();
     m_InputProxy->Process();
     m_EventBroker->Swap();
 
@@ -96,8 +96,6 @@ void Game::Tick()
     GLERROR("Game::Tick m_Renderer->Draw");
     m_EventBroker->Swap();
     m_EventBroker->Clear();
-
-    glfwPollEvents();
 }