Merge branch 'master' into clean999

slave variables documentation - Pregmod.txt

src/SpecialForce/CheatEdit.tw

src/SpecialForce/NamingColonel.tw

src/SpecialForce/Proposal.tw

src/SpecialForce/SpecialForce.js

src/SpecialForce/WeeklyChoices.tw

src/js/assayJS.js

src/js/assignJS.js

src/js/generateGenetics.js

src/js/generateMarketSlave.js

src/js/relationshipChecks.js

src/js/removeActiveSlave.js

src/js/rulesAssistant.js

src/js/sexActsJS.js

src/js/slaveCostJS.js

src/js/slaveGenerationJS.js

src/js/storyJS.js

src/js/utilJS.js

src/npc/agent/agentFramework.js

src/npc/fDance.tw