Merge branch 'master' into i18n

.gitignore

game/engines/default/engine/Game.lua

game/engines/default/engine/Zone.lua

game/engines/default/engine/generator/map/MapScript.lua

game/engines/default/engine/tilemaps/Rooms.lua

game/engines/default/engine/tilemaps/Tilemap.lua

game/modules/tome/ai/worldnpcs.lua

game/modules/tome/class/Actor.lua

game/modules/tome/class/Game.lua

game/modules/tome/class/GameState.lua

game/modules/tome/class/NPC.lua

game/modules/tome/class/NicerTiles.lua

game/modules/tome/data/damage_types.lua

game/modules/tome/data/general/events/drake-cave.lua

game/modules/tome/data/general/grids/psicave.lua

game/modules/tome/data/general/grids/sanddunes.lua

...es/tome/data/general/objects/random-artifacts/generic.lua

...me/data/gfx/shockbolt/terrain/psicave/psitech_V3_1_01.png

...me/data/gfx/shockbolt/terrain/psicave/psitech_V3_3_01.png

...me/data/gfx/shockbolt/terrain/psicave/psitech_V3_7_01.png