Merge branch 'master' into ItemsAndShops

game/engines/default/engine/Birther.lua

game/engines/default/engine/DebugConsole.lua

game/engines/default/engine/Entity.lua

game/engines/default/engine/Zone.lua

game/engines/default/engine/interface/ActorInventory.lua

game/engines/default/engine/resolvers.lua

game/engines/default/engine/utils.lua

game/modules/tome/class/Actor.lua

game/modules/tome/class/GameState.lua

game/modules/tome/class/NPC.lua

game/modules/tome/class/Object.lua

game/modules/tome/data/birth/classes/afflicted.lua

game/modules/tome/data/birth/classes/celestial.lua

game/modules/tome/data/birth/classes/chronomancer.lua

game/modules/tome/data/birth/classes/corrupted.lua

game/modules/tome/data/birth/classes/mage.lua

game/modules/tome/data/birth/classes/rogue.lua

game/modules/tome/data/birth/classes/warrior.lua

game/modules/tome/data/birth/classes/wilder.lua

game/modules/tome/data/general/encounters/maj-eyal.lua