Manual merge and minor fixes.

devNotes/VersionChangeLog-Premod+LoliMod.txt

devNotes/twine JS

src/SecExp/SpecialForceUpgradeOptions.tw

src/SecExp/attackGenerator.tw

src/SecExp/attackHandler.tw

src/SecExp/attackOptions.tw

src/SecExp/attackReport.tw

src/SecExp/edicts.tw

src/SecExp/encyclopediaSecExpBattles.tw

src/SecExp/encyclopediaSecExpMain.tw

src/SecExp/proclamations.tw

src/SecExp/propagandaHub.tw

src/SecExp/rebellionEvents.tw

src/SecExp/rebellionOptions.tw

src/SecExp/riotControlCenter.tw

src/SecExp/secBarracks.tw

src/SecExp/secExpOptions.tw

src/SecExp/secExpSmilingMan.tw

src/SecExp/securityHQ.tw

src/SecExp/securityReport.tw