Merge branch 'master' into dev

DoL Changelog.txt

devTools/androidsdk/image/cordova/config.xml

game/01-config/sugarcubeConfig.js

game/03-JavaScript/save.js

game/04-Variables/variables-versionUpdate.twee

game/base-clothing/wardrobes.twee

game/base-combat/actionsGeneration.twee

game/base-system/overlays/cheats.twee

game/base-system/parasites.twee

game/base-system/settings.twee

game/base-system/widgets.twee

game/overworld-forest/loc-forest/main.twee

game/overworld-forest/loc-lake/main.twee

game/overworld-forest/loc-lake/mason.twee

game/overworld-town/loc-beach/main.twee

game/overworld-town/loc-hospital/parasite-removal.twee

game/overworld-town/loc-pirates/main.twee

game/overworld-town/loc-school/changing-rooms-widgets.twee

game/overworld-town/loc-school/classes/english-events.twee

game/overworld-town/loc-school/widgets-events.twee