Merge branch 'miami' into lcs

# Conflicts:
#	src/control/Script5.cpp
#	src/entities/Entity.cpp

src/peds/Ped.cpp

@@ -39,6 +39,7 @@
 #include "CutsceneShadow.h"
 #include "Clock.h"
 #include "Wanted.h"
+#include "SaveBuf.h"
 
 CPed *gapTempPedList[50];
 uint16 gnNumTempPedList;