Merge branch 'master' into terencehill/scoreboard_ui

# Conflicts:
#	qcsrc/client/main.qc

diff --cc qcsrc/client/hud/panel/scoreboard.qc
Simple merge

diff --cc qcsrc/client/main.qc
index b6114910e95653545b22a34b09586709b0117761,8bd5d78638c1fc607fd379d7d1b20d82d0b52ca9..bf34cce82f644cb251b2db76cb7350af88a016d7
--- 1/qcsrc/client/main.qc
--- 2/qcsrc/client/main.qc
+++ b/qcsrc/client/main.qc
@@@ -450,10 -454,7 +454,11 @@@ float CSQC_InputEvent(int bInputType, f
  {
        TC(int, bInputType);
        bool override = false;
+ 
 +      override |= HUD_Scoreboard_InputEvent(bInputType, nPrimary, nSecondary);
 +      if (override)
 +              return true;
 +
        override |= HUD_Panel_InputEvent(bInputType, nPrimary, nSecondary);
        if (override)
                return true;