Updated for new structure
Merge branch '3.3.5a' of git@github.com:worldengine/wowengine-game.git into 3.3.5a