Merge pull request #9756 from Coolthulhu/item-desc

Adds item description for BELTED, OUTER and FLOATATION
Made changelog current as of b836cdc78ef97ee9688030a1f152192f8140e93e.
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA into deathcam

Conflicts:
	src/game.cpp
Add error reporting to saving of options
Add error reporting to saving the world options.

The popup in case of errors is now inside the save_world function and does not need to be in make_new_world.
Furniture-forge disassembly fix.

Fixes https://github.com/CleverRaven/Cataclysm-DDA/issues/9764.
Derp.
Merge to mainline

Conflicts:
	src/creature.cpp
	src/disease.cpp
	src/game.cpp
	src/iuse.cpp
Select current scenario on new character tab
Merge branch 'ReverseFix' of https://github.com/malhawee/Cataclysm-DDA into merge
Merge branch 'update-scenario' of https://github.com/arcke/Cataclysm-DDA into merge
Merge branch 'CruiseSafe' of https://github.com/malhawee/Cataclysm-DDA into merge
Merge branch 'saving-options' of https://github.com/BevapDin/Cataclysm-DDA into merge
Merge branch 'forge-fix' of https://github.com/Rivet-the-Zombie/Cataclysm-DDA into merge
Implement most suggestions
Update JSON file
More WIP

Changing gears to check on a bug report.
Fixes disrespectful healing method.
Merge pull request #9778 from KA101/mendmend

Fixes disrespectful healing method
Effect mod storage type rewrite