Fix predicting touching items in CTF and 1FCTF

In CTF, rail or plasma gun/ammo were not predicted for pickup depending on what team player is on. The rail and plasma values are the same as PW_REDFLAG and PW_BLUEFLAG.
In 1FCTF, only neutral flag, BFG, and BFG ammo were predicted for pickup. WP_BFG is equal to PW_NEUTRALFLAG.
Merge remote-tracking branch 'ioquake3/master'

Conflicts:
	code/cgame/cg_predict.c