Merge branch 'master' into more_fixes

game/engines/default/engine/HotkeysIconsDisplay.lua

game/engines/default/engine/LogDisplay.lua

game/engines/default/engine/UserChat.lua

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

game/modules/tome/class/Game.lua

game/modules/tome/data/general/npcs/ogre.lua

game/modules/tome/data/gfx/shaders/lava.frag

game/modules/tome/data/gfx/talents/arcane_power.png

game/modules/tome/data/gfx/talents/arcane_vortex.png

game/modules/tome/data/gfx/talents/blur_sight.png

game/modules/tome/data/gfx/talents/chain_lightning.png

game/modules/tome/data/gfx/talents/dig.png

game/modules/tome/data/gfx/talents/disruption_shield.png

game/modules/tome/data/gfx/talents/feather_wind.png

game/modules/tome/data/gfx/talents/fireflash.png

game/modules/tome/data/gfx/talents/flame.png

game/modules/tome/data/gfx/talents/flameshock.png

game/modules/tome/data/gfx/talents/freeze.png

game/modules/tome/data/gfx/talents/glacial_vapour.png

game/modules/tome/data/gfx/talents/illuminate.png