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

game/engines/default/engine/Trap.lua

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

game/modules/tome/class/Actor.lua

game/modules/tome/class/Game.lua

game/modules/tome/class/Object.lua

game/modules/tome/class/Trap.lua

game/modules/tome/class/Zone.lua

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

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

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

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

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

game/modules/tome/resolvers.lua