Merge branch 'sort_armour_fix' of https://github.com/reverieAlice/Cataclysm-DDA into WhiteRabbit
Small fixes, phonebook crash, mapgen issues
Merge pull request #7855 from vache/misc_fixes

Small fixes, phonebook crash, mapgen issues
Merge branch 'rip' of https://github.com/OzoneH3/Cataclysm-DDA into OzoneH3-rip
Add bible3

What it sounds like.
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA
Merge remote-tracking branches 'dda/pr/7825' and 'dda/pr/7844' into dda-master

* dda/pr/7825:
  New Mod: No Rivtech Guns

* dda/pr/7844:
  disable auto-note by default
Tweaks the numbers on most clothing items.

Since we have an awesome new layering system and a newly adjusted armor
calculation, these were overdue.
Fixes time requirement for punch dagger recipe.
Merge pull request #7795 from kevingranade/data-driven-drugs

[READY] Data driven drugs
Adds toolbox to construction menu recipes.
Basic Zones Manager GUI.
JSON description tweaks

Most of these changes are typo fixes, and that includes English -> American English spelling changes for consistency, wherever I could find them.

archery.json was given a lot of attention, and most of the descriptions have been reworded for better clarity. Also, all instances of 'wood' and 'metal' in the ammo names have been changed to 'wooden' and 'metallic' in better keeping with proper grammar.
Json saving/loading.
Some alterations
Cache and check zone data when pickung up items.
Merge pull request #7856 from Rivet-the-Zombie/clothing-tweaks

Tweaks the numbers on most clothing items.
Merge pull request #7857 from Rivet-the-Zombie/punch-dagger-time-fix

Fixes time requirement for punch dagger recipe.
Merge pull request #7858 from Rivet-the-Zombie/more-fixes

Adds toolbox to construction menu recipes.
KA101 revision

+ removal of comma in composite bow description