Materials fix for a few things I missed.
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA
Lord of the Terrains: Return of the Yellow
Merge branch 'melee-weapon-degradation' of https://github.com/Rivet-the-Zombie/Cataclysm-DDA into Rivet-the-Zombie-melee-weapon-degradation
Merge branch 'Rivet-the-Zombie-melee-weapon-degradation'
Merge pull request #6567 from Lain-/various-tweaks

Item tweaks II
Merge vehicle mirror support.
Merge faster access of item invlets.
Merge SDL soft render option and fullscreen improvement.

Conflicts:
	src/sdltiles.cpp
Track unbound keys so they don't get rebound if they had defaults.
Merge pull request #6566 from bdragon28/bdragon-update-signoff

My signoff.
Merge memory leaks and rotation fix.
Do the part removal cleanup as soon as removing the parts when doing vehicle crafting.
Expands gunmod compatability a bit in order to better take advantage of the new gunmod slot system.
MErge fixes to vehicle processing, keybinding tracking, and vehicle caches.
Hopefully almost there

Frickin' map issues.
Update FAQ section to reflect changes to fungal infection's counter measures.
more update
Merge pull request #6576 from Rivet-the-Zombie/mod-tweaks

Expands gunmod compatability a bit in order to better take advantage of the new gunmod slot system.
updated the food sickness FAQ