Reduce time scaling rate for batch crafting
Hotdog MRE price fix
Reconfigure fire damage handling a bit.
Tone down rate at which creatures catch on fire from fire damage.
Refactor handling of standing in a fire to handle the case where the player cannot stand.
Merge branch 'batch_scaling' of https://github.com/veri745/Cataclysm-DDA into merge
Merge branch 'mre-fix' of https://github.com/Mshock777/Cataclysm-DDA into merge

Conflicts:
	data/json/items/melee.json

No idea why the indentation was so Weird.
Merge branch 'make-falling-in-fire-dangerous' of https://github.com/kevingranade/Cataclysm-DDA into merge
Replaced socks for maids with stockings
Fixed desc for Probability Travel bionic & CBM
Fixes comment in game.cpp to match the current code
Merge pull request #9638 from ryvn/master

Tooltip fix for Bionic Probability Travel
Argentinean update
French update
Russian update
Merge pull request #9641 from VlasovVitaly/translations-update

Translations update
Merge branch 'Atzerkins' of https://github.com/Atzerkins/Cataclysm-DDA into merge
Fix commas.
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA