Merge remote-tracking branch 'upstream/pregmod-master' into pregmod-dev

devTools/javaSanityCheck/ignoredVariables

src/004-base/proxies.js

src/SecExp/js/secExp.js

src/gui/css/mainStyleSheet.css

src/init/storyInit.tw

src/interaction/main/mainLinks.js

src/js/DefaultRules.js

src/js/economyJS.js

src/js/rulesAssistant.js

src/js/rulesAssistantOptions.js

src/js/slaveSummaryWidgets.js

src/js/storyJS.js

src/pregmod/personalNotes.tw

src/pregmod/theBlackMarket.tw

src/uncategorized/arcmgmt.tw

src/uncategorized/main.tw

src/uncategorized/slaveAssignmentsReport.tw

src/uncategorized/storyCaption.tw