Some merge fixes, needs more work

src/Game/Game.cpp

@@ -14,7 +14,6 @@ Game::Game(int argc, char* argv[])
     // Create the core event broker
     m_EventBroker = new EventBroker();
 
-    m_RenderQueueFactory = new RenderQueueFactory();
 
     // Create the renderer
     m_Renderer = new Renderer(m_EventBroker, m_World);
@@ -48,6 +47,8 @@ Game::Game(int argc, char* argv[])
         ResourceManager::Load<EntityXMLFile>(mapToLoad)->PopulateWorld(m_World);
     }
 
+    m_RenderQueues = new RenderQueueCollection();
+
     // Create system pipeline
     m_SystemPipeline = new SystemPipeline(m_EventBroker);
     m_SystemPipeline->AddSystem<RaptorCopterSystem>();