Fixed some problems that Akari pointed out.
Merge remote-tracking branch 'vecxis/master' into vecxis

Conflicts:
	qcsrc/server/teamplay.qc