Merge branch 'master' of git.net-core.org:tome/t-engine4

game/modules/tome/data/chats/assassin-lord.lua

game/modules/tome/data/general/events/meteor.lua

game/modules/tome/data/general/events/pyroclast.lua

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

game/modules/tome/data/gfx/particles/meteor.lua

game/modules/tome/data/talents/celestial/combat.lua

game/modules/tome/data/talents/corruptions/vile-life.lua

game/modules/tome/data/talents/cursed/force-of-will.lua

game/modules/tome/data/talents/psionic/dream-smith.lua

game/modules/tome/data/talents/spells/glacial-waste.lua

game/modules/tome/data/talents/spells/master-of-flesh.lua

game/modules/tome/data/talents/uber/wil.lua

game/modules/tome/data/zones/demon-plane/npcs.lua

game/modules/tome/data/zones/unhallowed-morass/npcs.lua