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/Frontend.cpp

@@ -41,7 +41,6 @@
 #include "sampman.h"
 
 // --LCS: changed a bit to have lcs feel, needs more work
-
 // Similar story to Hud.cpp:
 // Game has colors inlined in code.
 // For easier modification we collect them here: