Merge branch 'dev' into 'master'

DoL Changelog.txt

devTools/androidsdk/image/cordova/config.xml

game/01-config/sugarcubeConfig.js

game/03-JavaScript/sexToysInventory.js

game/04-Variables/canvasmodel-main.js

game/04-Variables/feats.js

game/04-Variables/variables-passageHeader.twee

game/04-Variables/variables-start.twee

game/04-Variables/variables-versionUpdate.twee

game/base-clothing/clothing-handheld.js

game/base-combat/actionsGeneration.twee

game/base-combat/ejaculation.twee

game/base-combat/init.twee

game/base-combat/machine/actions.twee

game/base-combat/swarm-effects.twee

game/base-combat/tentacles/abomination.twee

game/base-combat/tentacles/tentacleActionsGeneration.twee

game/base-combat/tentacles/tentacles.twee

game/base-combat/vore.twee

game/base-debug/test demon.twee