Merge branch 'master' into herm-npcs-mod

devTools/androidsdk/image/cordova/config.xml

game/01-config/sugarcubeConfig.js

game/03-JavaScript/UI.js

game/03-JavaScript/eyesRelated.js

game/03-JavaScript/save.js

game/03-JavaScript/sexShopMenu.js

game/04-Variables/colours.js

game/04-Variables/variables-passageFooter.twee

game/04-Variables/variables-start2.twee

game/04-Variables/variables-versionUpdate.twee

game/base-clothing/clothing-feet.twee

game/base-clothing/clothing-genitals.twee

game/base-clothing/clothing-lower.twee

game/base-clothing/clothing-upper.twee

game/base-clothing/widgets.twee

game/base-combat/actions-hands.twee

game/base-combat/actionsGeneration.twee

game/base-combat/beast.twee

game/base-combat/effects.twee

game/base-combat/man-combat.twee