Merge remote-tracking branch 'origin/master' into miami

# Conflicts:
#	src/audio/AudioLogic.cpp
#	src/control/Garages.cpp
#	src/core/SurfaceTable.cpp
#	src/core/SurfaceTable.h
#	src/core/World.cpp
#	src/core/main.cpp
#	src/modelinfo/PedModelInfo.cpp
#	src/peds/Ped.cpp
#	src/render/Timecycle.cpp
#	src/vehicles/Automobile.cpp
#	src/vehicles/Automobile.h
#	src/vehicles/Heli.cpp
#	src/vehicles/Vehicle.cpp
#	src/weapons/Weapon.cpp
#	src/weapons/WeaponInfo.h

premake5.lua

@@ -186,8 +186,6 @@ project "reVC"
 	includedirs { "src/weapons" }
 	includedirs { "src/extras" }
 	includedirs { "eax" }
-
-	includedirs { "eax" }
 	
 	filter "platforms:*mss"
 		defines { "AUDIO_MSS" }