More useful info-bubble readout for ammo and guns.
Fixed cside include in aaa_autoincludes.lua
Merge branch 'master' of https://github.com/nrlulz/ACF
Version 480.
Merge remote-tracking branch 'remotes/upstream/master'

Conflicts:
	lua/acf/server/sv_acfbase.lua
	lua/autorun/acf_globals.lua
Forgot some debug prints.
Added client convar ACF_GunInfoWhileSeated to hide gun bubbles while in vehicle.
Tank Guns aren't just for tanks!  Renamed to cannon.
Smoke fills faster (closer to WP now, but still slow)
Merge remote-tracking branch 'remotes/upstream/master'

Conflicts:
	lua/acf/server/sv_acfbase.lua
	lua/autorun/acf_globals.lua