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

devTools/androidsdk/image/cordova/config.xml

game/01-config/sugarcubeConfig.js

game/03-JavaScript/UI.js

game/04-Variables/variables-versionUpdate.twee

game/base-clothing/clothing-sets.twee

game/base-clothing/images.twee

game/base-clothing/shop.twee

game/base-clothing/update.twee

game/base-clothing/wardrobes.twee

game/base-clothing/widgets.twee

game/base-combat/beast.twee

game/base-combat/end.twee

game/base-combat/tentacles/tentacles.twee

game/base-system/caption.twee

game/base-system/feats.twee

game/base-system/named-npcs.twee

game/base-system/settings.twee

game/base-system/time.twee

game/base-system/widgets.twee

game/flavour-text-generators/seasonal-events.twee