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

Changelog.txt

TODO.txt

src/SpecialForce/Firebase.tw

src/SpecialForce/SpecialForce.js

src/gui/Encyclopedia/encyclopedia.tw

src/js/colorinput.js

src/js/datatypeCleanupJS.js

src/js/generateGenetics.js

src/js/pregJS.js

src/js/slaveSummaryWidgets.js

src/js/storyJS.js

src/js/surgery.js

src/js/utilJS.js

src/npc/descriptions/boobs/boobs.js

src/npc/startingGirls/startingGirls.tw

src/player/actions/fEmbrace.tw

src/uncategorized/RESS.tw

src/uncategorized/hgApplication.tw

src/uncategorized/newSlaveIntro.tw

src/uncategorized/pPeacekeepersIndependence.tw