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/objects/DummyObject.cpp

@@ -3,8 +3,6 @@
 #include "DummyObject.h"
 #include "Pools.h"
 
-// --MIAMI: file done
-
 CDummyObject::CDummyObject(CObject *obj)
 {
 	SetModelIndexNoCreate(obj->GetModelIndex());

src/objects/ObjectData.cpp

@@ -6,8 +6,6 @@
 #include "FileMgr.h"
 #include "ObjectData.h"
 
-//--MIAMI: file done
-
 CObjectInfo CObjectData::ms_aObjectInfo[NUMOBJECTINFO];
 
 // Another ugly file reader

src/objects/Projectile.cpp

@@ -2,8 +2,6 @@
 
 #include "Projectile.h"
 
-// --MIAMI: file done
-
 CProjectile::CProjectile(int32 model) : CObject()
 {
 	m_fMass = 1.0f;