Merge branch 'Mario/teams_bitflag' into 'master'

Merge branch Mario/teams_bitflag (M merge request)

Adds support for odd team matches, such as pink vs blue and yellow vs red.

See merge request !335

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

diff --cc qcsrc/common/gamemodes/gamemode/nexball/nexball.qc
Simple merge

diff --cc qcsrc/common/gamemodes/gamemode/onslaught/onslaught.qc
Simple merge

diff --cc qcsrc/server/bot/bot.qc
Simple merge

diff --cc qcsrc/server/cl_client.qc
Simple merge

diff --cc qcsrc/server/mutators/mutator/gamemode_assault.qc
Simple merge

diff --cc qcsrc/server/mutators/mutator/gamemode_ctf.qc
Simple merge

diff --cc qcsrc/server/mutators/mutator/gamemode_invasion.qc
Simple merge

diff --cc qcsrc/server/mutators/mutator/gamemode_keyhunt.qc
Simple merge

diff --cc qcsrc/server/mutators/mutator/gamemode_race.qc
Simple merge