Merge branch 'master' into chrono_talent_balance

game/engines/default/engine/Module.lua

game/engines/default/engine/Savefile.lua

game/engines/default/engine/SavefilePipe.lua

game/engines/default/engine/dialogs/SteamOptions.lua

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

game/engines/default/engine/init.lua

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

game/engines/default/engine/utils.lua

game/engines/default/modules/boot/class/Game.lua

game/engines/default/modules/boot/class/Grid.lua

game/engines/default/modules/boot/class/NicerTiles.lua

game/engines/default/modules/boot/class/interface/Combat.lua

...engines/default/modules/boot/data/general/grids/basic.lua

...ngines/default/modules/boot/data/general/grids/forest.lua

...engines/default/modules/boot/data/general/grids/water.lua

...default/modules/boot/data/gfx/attacks/attack_white_01.png

...default/modules/boot/data/gfx/attacks/attack_white_02.png

...default/modules/boot/data/gfx/attacks/attack_white_03.png

...default/modules/boot/data/gfx/attacks/attack_white_04.png

...default/modules/boot/data/gfx/attacks/attack_white_05.png