resolve merge conflict

devNotes/Useful JS Function Documentation.txt

devTools/FC.d.ts

devTools/sugarcube.d.ts

slave variables documentation - Pregmod.txt

src/002-config/fc-version.js

src/003-assets/CSS/RAoptions.css

src/SecExp/propagandaHub.tw

src/SecExp/riotControlCenter.tw

src/SecExp/secBarracks.tw

src/SecExp/securityHQ.tw

src/SpecialForce/Firebase.tw

src/SpecialForce/SpecialForce.js

src/gui/Encyclopedia/encyclopedia.tw

src/init/setupVars.tw

src/init/storyInit.tw

src/interaction/prothesticLab.tw

src/js/DefaultRules.js

src/js/SlaveState.js

src/js/datatypeCleanupJS.js

src/js/futureSocietyJS.js