Merge branch '1.7misc' into 'master'

game/modules/tome/class/Actor.lua

game/modules/tome/class/GameState.lua

game/modules/tome/class/Trap.lua

game/modules/tome/class/interface/Combat.lua

game/modules/tome/data/chats/shertul-fortress-butler.lua

.../modules/tome/data/general/objects/egos/totems-powers.lua

game/modules/tome/data/general/objects/egos/wands-powers.lua

...les/tome/data/maps/vaults/auto/greater/living-weapons.lua

game/modules/tome/data/resources.lua

game/modules/tome/data/talents/corruptions/bone.lua

game/modules/tome/data/talents/corruptions/scourge.lua

game/modules/tome/data/talents/cunning/poisons.lua

game/modules/tome/data/talents/gifts/eyals-fury.lua

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

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

game/modules/tome/data/talents/psionic/thought-forms.lua

game/modules/tome/data/talents/spells/arcane.lua

game/modules/tome/data/talents/techniques/warcries.lua

game/modules/tome/data/timed_effects/magical.lua

game/modules/tome/data/timed_effects/mental.lua