update CBP
Merge pull request #6210 from Soyweiser/Lamp_oil

Fixed lamp oil spawns.
Merge pull request #6207 from vidarsk/examine_pick_up_water_fix

Fixed bug found by Voker57, can pick up (infinite) water w/o container if slaked.
Merge pull request #6200 from Soyweiser/Irradiated

Food irradiation descriptions.
Conflicts:
	data/json/items/comestibles.json
Merge pull request #6213 from KA101/FixHealing

Fix status-healing
Merge branch 'food_intolerance_fix' of https://github.com/vidarsk/Cataclysm-DDA into vidarsk-food_intolerance_fix
Merge pull request #6216 from Chase-san/battery-dies

Fix battery dies issue.
soup fix
Merge pull request #6227 from BevapDin/fix-something-else

Infinite loop on loading
Merge pull request #6219 from talktips/fungaloid

mon_fungaloid_dormant
Conflicts:
	src/monstergenerator.cpp
recategory
Merge cleanup, moved extra stuff into mods.