Moved gm and mapgen to Game
Merge remote branch 'origin/master'