upstream r5026:r5028 matchstrings cleanup.
Fix joystick config.
Config upstream merge.
Gui fixes and tweaks.
Upstream client merge, fix N_WELCOME.
Merge upstream server changes.
Fix geoip handle checking.
Merge upstream changes to fpsgame.
Some config fixes.
Update cubescript.