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/vehicles/Cranes.cpp

@@ -12,8 +12,6 @@
 #include "Object.h"
 #include "World.h"
 
-// --MIAMI: file done
-
 #define MAX_DISTANCE_TO_FIND_CRANE (100.0f)
 #define CRANE_UPDATE_RADIUS (300.0f)
 #define CRANE_MOVEMENT_PROCESSING_RADIUS (150.0f)