fix conflicts

src/004-base/facility.js

src/SpecialForce/Proposal.tw

src/SpecialForce/SpecialForce.js

src/SpecialForce/Upgrades.tw

src/debugging/debugJS.js

src/endWeek/saChoosesOwnClothes.js

src/init/dummy.tw

src/init/storyInit.tw

src/js/DefaultRules.js

src/js/accordianJS.js

src/js/colorinput.js

src/js/datatypeCleanupJS.js

src/js/economyJS.js

src/js/futureSocietyJS.js

src/js/generateGenetics.js

src/js/hTagMacroJS.js

src/js/heroCreator.js

src/js/physicalDevelopment.js

src/js/rbuttonJS.js

src/js/spanMacroJS.js