SO

put shops/gargae for SO and fix SWAT training shops