Merge branch 'master' into miami

# Conflicts:
#	gamefiles/TEXT/american.gxt
#	src/control/Garages.cpp
#	src/control/Record.cpp
#	src/control/Script.cpp
#	src/core/Collision.cpp
#	src/core/Frontend.cpp
#	src/core/Frontend.h
#	src/core/Game.cpp
#	src/core/MenuScreens.cpp
#	src/core/Streaming.cpp
#	src/core/config.h
#	src/core/re3.cpp
#	src/modelinfo/ModelInfo.cpp
#	src/render/Renderer.cpp
#	src/save/GenericGameStorage.cpp
#	utils/gxt/american.txt

src/peds/Population.cpp

@@ -127,8 +127,7 @@ CPopulation::Initialise()
 void
 CPopulation::RemovePed(CPed *ent)
 {
-	// CPed dtor already does that
-	// CWorld::Remove((CEntity*)ent);
+	CWorld::Remove((CEntity*)ent);
 	delete ent;
 }