FRESH FISH

Four new Species of freshwater New England fish:
+ Bluegill
+ Smallmouth bass
+ Largemouth Bass
+ Striped Bass

Removes Generic 'bass'
- Bass
Remove commented out code
Player.h Documentation 1
Merge remote-tracking branch 'Madnus/FRESH-FISH'
Sword draw speed now depends on volume of sword
Iaijutsu message works a bit better now
Certain swords can't perform iaijutsu
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA into scabbard
Merge pull request #6974 from i2amroy/Documentation

Player.h Documentation 1
Merge pull request #6971 from John-Candlebury/More-basements

Remodeled the junk basement
Let's remove the disassembly option from anvils, shall we?
Merge remote-tracking branch 'CleverRaven/master'

Conflicts:
	src/player.h
Now a difference between sheathable knives and swords
Added sheath item for knives
Ankle holster can now store pistols or knives
Fix drawing sword not printing message if iaijustu triggers and no monster
is adjacent
Using boots now only shows sheathable knives instead of just tools
Merge pull request #6972 from Madnus/FRESH-FISH

FRESH FISH
Add sheath and holster to item groups
Add recipes for making holster and sheath
Merge remote-tracking branch 'CleverRaven/master'
Change some drawing/sheathing/holstering messages
A bit of refactoring, too
Note as requested

Just documents the feature.  Will take a shot at doxygen-ing it
tomorrow.
Pressing 'f' while unarmed now automatically draws a pistol from a holster
If there's multiple holsters with pistols, it asks which one to draw from
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA into scabbard
Lots more SHEATH_KNIFE flags
Update some docs 'n comments
Ammo now displayed on quick draw menu
Also fixed some parenthesis and some nitpicky description stuff