Merge remote-tracking branch 'upstream/master' into herm-npcs-mod

DoL Changelog.txt

devTools/androidsdk/image/cordova/config.xml

game/01-config/sugarcubeConfig.js

game/04-Variables/variables-versionUpdate.twee

game/base-clothing/clothing-upper.twee

game/base-combat/actions-penis.twee

game/base-combat/actions-text.twee

game/base-combat/actions-vagina.twee

game/base-combat/beast.twee

game/base-combat/effects.twee

game/base-combat/ejaculation-sydney.twee

game/base-combat/end.twee

game/base-combat/init.twee

game/base-combat/machine/machine.twee

game/base-combat/man-combat.twee

game/base-combat/speech-sydney.twee

game/base-combat/struggle.twee

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

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

game/base-combat/widgets.twee