Merge branch 'master' into NPCObjectUse

game/engines/default/engine/Zone.lua

game/engines/default/engine/ui/Dialog.lua

game/modules/tome/class/uiset/ClassicPlayerDisplay.lua

game/modules/tome/data/damage_types.lua

game/modules/tome/data/general/objects/egos/staves.lua

game/modules/tome/data/talents/gifts/mindstar-mastery.lua

game/modules/tome/data/talents/misc/inscriptions.lua

game/modules/tome/data/talents/psionic/slumber.lua

game/modules/tome/data/talents/spells/staff-combat.lua