Merge branch 'master' into more_fixes

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

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

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

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

game/modules/tome/class/Actor.lua

game/modules/tome/class/Encounter.lua

game/modules/tome/class/Game.lua

game/modules/tome/data/general/objects/boss-artifacts.lua

...les/tome/data/gfx/achievements/exploration_win_bikini.png

...es/tome/data/gfx/achievements/exploration_win_mankini.png

...ome/data/gfx/achievements/insane_adventure_win_bikini.png

...me/data/gfx/achievements/insane_adventure_win_mankini.png

.../modules/tome/data/gfx/achievements/insane_win_bikini.png

...modules/tome/data/gfx/achievements/insane_win_mankini.png

...me/data/gfx/achievements/madness_adventure_win_bikini.png

...e/data/gfx/achievements/madness_adventure_win_mankini.png

...modules/tome/data/gfx/achievements/madness_win_bikini.png

...odules/tome/data/gfx/achievements/madness_win_mankini.png

.../data/gfx/achievements/nightmare_adventure_win_bikini.png

...data/gfx/achievements/nightmare_adventure_win_mankini.png