merge

devNotes/VersionChangeLog-Premod+LoliMod.txt

src/SecExp/attackGenerator.tw

src/SecExp/attackReport.tw

src/SecExp/rebellionGenerator.tw

src/SpecialForce/SpecialForce.js

src/SpecialForce/TrickShotNight.tw

src/facilities/farmyard/farmyard.tw

src/facilities/farmyard/food/foodMarket.tw

src/facilities/nursery/childrenReport.tw

src/facilities/nursery/nursery.tw

src/gui/Encyclopedia/encyclopediaWidgets.tw

src/init/dummy.tw

src/init/storyInit.tw

src/js/SlaveState.js

src/js/utilJS.js

src/npc/newSlaveIncestSex.tw

src/uncategorized/BackwardsCompatibility.tw

src/uncategorized/arcade.tw

src/uncategorized/brothel.tw

src/uncategorized/cellblock.tw