Merge branch 'mercs' into 'pregmod-master'

src/events/nonRandom/mercs/pMercenaries.js

src/events/nonRandom/mercs/pMercenaries.tw

src/events/nonRandom/mercs/pMercenaryRomeo.js

src/events/nonRandom/mercs/pMercenaryRomeo.tw

src/events/nonRandom/mercs/pMercsHelpCorp.js

src/events/nonRandom/mercs/pMercsHelpCorp.tw

src/events/nonRandom/mercs/pRaidInvitation.js

src/events/nonRandom/mercs/pRaidInvitation.tw

src/events/nonRandom/mercs/pRaidResult.js

src/events/nonRandom/mercs/pRaidResult.tw

src/events/nonRandom/mercs/pSlaveMedic.js

src/events/nonRandom/mercs/pSlaveMedic.tw

src/events/nonRandom/mercs/pSnatchAndGrab.js

src/events/nonRandom/mercs/pSnatchAndGrab.tw

src/events/nonRandom/mercs/pSnatchAndGrabResult.js

src/events/nonRandom/mercs/pSnatchAndGrabResult.tw

src/events/nonRandomEvent.js

src/events/timeGatedPlotEvent.js