Merge remote-tracking branch 'upstream/master'

Conflicts:
	binaries/data/mods/public/gui/gamesetup/gamesetup.js
Merge changed from leper and JoshuaJB.
Merge upstream
Merge with Josh
Remove useless variables.
Merge branch 'lobby' of https://github.com/leper/0ad into lobby