Merge branch 'master' of git://github.com/Unvanquished/Unvanquished into gameplay/master
Merge branch 'gameplay/viech' into gameplay/master
Fix quoting of some adminhelp output.
Don't abort map loading in the presence of a second worldspawn.

Report the error anyway; don't retain the offending entity.
(Fixes loading of veddak-final.)
Change order of includes to prevent errors
Merge remote-tracking branch 'origin/master' into gameplay/master
Add 'give bp' and 'give confidence' cheats.
Merge branch 'gameplay/master' into gameplay/viech