Adapt to the dev branch

[SaintWish]

This will help us get rid of the need of having maintain 2 branches.

[SaintWish]

• Galet's chest - The menu to see it's inventory doesn't seem to appear anymore.
• Votemap - it seems to call the votemap menu twice (after you try voting, it'll close out and open again) and that's it.
• Dev Staff's noclip doesn't work properly, when used you seem to get with a sort of rubberbanding like you're lagging. (MOVETYPE_NOCLIP is broken in dev branch #356)