Merge branch 'pregmod-master' into 'pregmod-master'

src/budget/budget.js

src/endWeek/events/expire.js

src/endWeek/saDrugs.js

src/events/scheduled/murderAttempt.js

src/interaction/budgets/recordTemplates.js

src/js/DefaultRules.js

src/js/economyJS.js

src/js/slaveCostJS.js