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

Conflicts:
	src/GameWorld.cpp
	vs11/Returngeance/Returngeance.vcxproj.filters

src/Systems/GameStateSystem.cpp

@@ -12,7 +12,7 @@ bool Systems::GameStateSystem::OnFlagCaptured(const Events::FlagCaptured &event)
 	m_InGame = false;
 
 	Events::GameOver e;
-	e.Winner = event.Player;
+	e.Player = event.Player;
 	EventBroker->Publish(e);
 
 	return true;