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

1 files changed, 0 insertions, 0 deletions

diff --git a/utils/gxt/gxt.exe b/utils/gxt/gxt.exe
index 0a39c0b1..ff264dad 100644
--- a/utils/gxt/gxt.exe
+++ b/utils/gxt/gxt.exe