Merge branch 'master' into herm-npcs-mod

DoL Changelog.txt

devTools/androidsdk/image/cordova/config.xml

game/01-config/sugarcubeConfig.js

game/03-JavaScript/link-override.js

game/03-JavaScript/scroll-bar.js

game/04-Variables/canvasmodel-00-data.js

game/04-Variables/canvasmodel-main.js

game/04-Variables/variables-passageHeader.twee

game/04-Variables/variables-start2.twee

game/04-Variables/variables-versionUpdate.twee

game/base-clothing/clothing-lower.twee

game/base-clothing/images.twee

game/base-combat/actions-hands.twee

game/base-combat/actionsGeneration.twee

game/base-combat/missionary-images.twee

game/base-combat/tentacles/tentacle-images.twee

game/base-system/options.twee

game/base-system/settings.twee

game/base-system/text.twee

game/overworld-forest/loc-wolfpack/wolf.twee