Merge branch 'master' into more_fixes

game/engines/default/engine/Entity.lua

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

game/engines/default/engine/utils.lua

game/loader/init.lua

game/modules/tome/class/Actor.lua

game/modules/tome/class/NPC.lua

game/modules/tome/class/Player.lua

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

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

game/modules/tome/data/general/objects/scrolls.lua

game/modules/tome/data/gfx/shockbolt/attachements.lua

...es/tome/data/gfx/shockbolt/terrain/ruins/floor_128_01.png

...es/tome/data/gfx/shockbolt/terrain/ruins/floor_128_02.png

...es/tome/data/gfx/shockbolt/terrain/ruins/floor_128_03.png

...modules/tome/data/gfx/shockbolt/terrain/ruins/wall_01.png

...modules/tome/data/gfx/shockbolt/terrain/ruins/wall_02.png

...modules/tome/data/gfx/shockbolt/terrain/ruins/wall_03.png

...modules/tome/data/gfx/shockbolt/terrain/ruins/wall_04.png

...modules/tome/data/gfx/shockbolt/terrain/ruins/wall_05.png

...modules/tome/data/gfx/shockbolt/terrain/ruins/wall_06.png