Gamemode support

Merging Branches: Master and Gamemode support