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/animation/AnimManager.cpp

@@ -12,8 +12,6 @@
 #include "AnimManager.h"
 #include "Streaming.h"
 
-//--MIAMI: file done
-
 CAnimBlock CAnimManager::ms_aAnimBlocks[NUMANIMBLOCKS];
 CAnimBlendHierarchy CAnimManager::ms_aAnimations[NUMANIMATIONS];
 int32 CAnimManager::ms_numAnimBlocks;
@@ -1477,7 +1475,6 @@ CAnimManager::LoadAnimFile(const char *filename)
 	RwStreamClose(stream, nil);
 }
 
-//--MIAMI: done
 void
 CAnimManager::LoadAnimFile(RwStream *stream, bool compress, char (*uncompressedAnims)[32])
 {