Merge branch 'master' into herm-npcs-mod

DoL Changelog.txt

devTools/androidsdk/image/cordova/config.xml

game/01-config/sugarcubeConfig.js

game/03-JavaScript/ingame.js

game/04-Variables/npcNamed.twee

game/04-Variables/variables-start.twee

game/04-Variables/variables-versionUpdate.twee

game/base-clothing/shop.twee

game/base-combat/actionsGeneration.twee

game/base-combat/audience.twee

game/base-combat/effects.twee

game/base-combat/ejaculation-eden.twee

game/base-combat/images.twee

game/base-combat/stalk/stalk.twee

game/base-system/journal.twee

game/base-system/named-npcs.twee

game/base-system/orgasm.twee

game/base-system/pregnancy/events.twee

game/base-system/social.twee

game/base-system/text.twee