Merge branch 'pregmod-master' into pregmod-dev

Makefile

compile.bat

devTools/scripts/includes.py

devTools/scripts/includes_windows.py

src/events/intro/initNationalities.tw

src/init/storyInit.tw

src/npc/acquisition.tw

src/npc/databases/cheatmodeDatabase.tw

src/npc/databases/dSlavesDatabase.tw

src/npc/databases/ddSlavesDatabase.tw

src/npc/exportSlave.tw

src/npc/removeActiveSlave.tw

src/npc/rgASDump.tw

src/npc/uploadSlave.tw

src/pregmod/agingTest.tw

src/uncategorized/generateXXSlave.tw

src/uncategorized/generateXYSlave.tw

src/uncategorized/newSlaveIntro.tw

src/uncategorized/randomNonindividualEvent.tw

src/uncategorized/reRelativeRecruiter.tw