Merge remote-tracking branch 'origin/miami' into lcs

# Conflicts:
#	src/animation/CutsceneMgr.cpp
#	src/control/CarCtrl.cpp
#	src/control/Script.cpp
#	src/control/Script2.cpp
#	src/core/Frontend.cpp
#	src/core/main.cpp
#	src/entities/Physical.cpp
#	src/peds/Ped.cpp
#	src/peds/PedAI.cpp
#	src/text/Messages.cpp
#	src/vehicles/Cranes.cpp
#	src/vehicles/Transmission.cpp

src/core/FileLoader.cpp

@@ -30,8 +30,6 @@
 #include "ColStore.h"
 #include "Occlusion.h"
 
-//--MIAMI: file done
-
 char CFileLoader::ms_line[256];
 
 const char*
@@ -1312,7 +1310,7 @@ CFileLoader::LoadOcclusionVolume(const char *line)
 }
 
 
-//--MIAMI: unused
+// unused
 void
 CFileLoader::ReloadPaths(const char *filename)
 {