replace all literal [skipnotify] with a shared define
draw clientnum in front of the crosshair displayed name for cg_drawCrosshairNames >= 2
Merge remote-tracking branch 'upstream/master'