Merge branch 'master' into herm-npcs-mod

devTools/androidsdk/image/cordova/config.xml

game/01-config/sugarcubeConfig.js

game/03-JavaScript/save.js

game/04-Variables/presets.twee

game/04-Variables/variables-start2.twee

game/04-Variables/variables-versionUpdate.twee

game/base-clothing/shop.twee

game/base-clothing/storeActions.twee

game/base-clothing/wardrobes.twee

game/base-combat/ejaculation.twee

game/base-combat/man-combat.twee

game/base-combat/stalk/stalk.twee

game/base-combat/state.twee

game/base-combat/swarm-effects.twee

game/base-debug/sceneViewer.twee

game/base-debug/testing-room.twee

game/base-system/creatures/events.twee

game/base-system/mirror.twee

game/base-system/settings.twee

game/base-system/text.twee