Merge branch Mario/ctf_updates (L merge request)

Adds support for 3 and 4 team CTF, along with a couple of other fixes & features (namely one-flag, new reverse mode where flags are not switched & players pickup their own flag, option to delay returning of the flag when it touches the void).