correct the list of headers (armor_layers.cpp)
Update melee.json

Added a definition for barbed wire baseball bats.
Update item_groups.json

Added barbed wire baseball bats to the survivor weapons group.
Update recipes.json

Added a recipe for barbed wire baseball bats.
Rough fix

This just gets the menu back onto the screen. Actual menu finagling
still needs to be done.
Merge pull request #7209 from Rivet-the-Zombie/glass-fix

Fixes weird made-up word in glass sheet description.
Merge pull request #7217 from Hiroga/barbedwire-bat

Adds barbed wire baseball bats
added function name_and_value (left aligned name, right aligned value)
"NEXT_TAB" instead of "NEX_TAB"
Fixed mistake in map::grid refactor in editmap.

Once again, was calling the wrong function.
corrected logic of name_and_value()
tweaked shrooms back, updated desc
updated desc
makes the debug menu cancelable with esc - like the comment says it should
Merge pull request #7212 from cSep/ynhighlight

Enhances the yes/no prompt
Merge branch 'Mapgen' of https://github.com/i2amroy/Cataclysm-DDA into i2amroy-Mapgen
Merge pull request #7222 from cSep/canceldebugmenu

Allow canceling the debug menu with Esc
Fix wintiles build by adding missing library refs.
Merge remote-tracking branch 'cSep/driedshrooms' into FrankenMod
Merge remote-tracking branch 'CleverRaven/master' into FrankenMod