Merge branch 'master' into havok

Conflicts:
	src/GameWorld.cpp
	src/Systems/GameStateSystem.cpp
	src/Systems/TankSteeringSystem.cpp
	vs11/Returngeance/Returngeance.vcxproj.filters

src/GUI/GameFrame.h

@@ -42,10 +42,10 @@ public:
 			m_FreeCamViewport = new Viewport(m_WorldFrame, "ViewportFreeCam", m_World);
 			m_FreeCamViewport->Hide();
 		}
-		//m_WorldFrame->Hide();
-		//m_MainMenuFrame = new MainMenuFrame(this, "MainMenu");
-
+		m_WorldFrame->Hide();
 		m_World->Initialize();
+
+		m_MainMenuFrame = new MainMenuFrame(this, "MainMenu");
 	}
 
 private: