Merge branch 'Salon-to-js' into 'pregmod-master'

js/003-data/miscData.js

js/003-data/slaveMods.js

src/events/intro/pcAppearance.js

src/facilities/bodyModification/bodyModification.js

src/facilities/salon/salon.tw

src/facilities/salon/salonPassage.js

src/gui/options/options.js

src/js/rulesAssistantOptions.js

src/js/salon.js

src/js/utilsFC.js

src/markets/specificMarkets/customSlaveMarket.js

src/npc/interaction/fAbuse.tw

src/uncategorized/salon.tw