Fix a possible NULL dereference (crosshair entity lookup).
Minor cleanup.
Restore crosshair player name display for spectators.
Merge branch 'gameplay/master' into gameplay/viech