Merge pull request #3045 from wito/september-fixes

Make volume consistent again.
Explicitly seek from the beginning of a JsonIn stream.
Use tell() in stead of stream->tellg() for JsonIn, while i'm at it.
Merge remote branch 'origin/master' into coordinate_sanity

Conflicts:
	game.cpp
Revert an ill-advised revert of a bug fix.

This reverts commit bf82319c1e3f828a055cedf93d7f9c48594aaf66.
Add a stack_size field to ammo and comestibles, defaulting to the starting number of charges.
Update JSON info documentation.
Make ammo stack_size consistent for each caliber, and meds' stack_size so that pills take up far less volume.
removing unused variables
small variable scope change, removed commented out code
small style changes in disease
small style changes to editmap.h
Remove unused bionic fake ammos.
Use unified ammo and gun effects in shoot_monster().
Apply bounce effect on hit whether it does damage or not to avoid infinite loops when the shot cannot damage a target.
Merge branch 'pr/3023'
changed from debugmsg to dbg(D_INFO)
Merge branch 'pr/3050'
Merge branch 'pr/3023'
Spelling fixes for flammenschwert

Fixes spelling for flammenschwert, also adds item descriptions (thanks
KA101 and OzoneH3)
Adds option to use kevlar plates when making survivor suits.

Since they're 90% scrap anyways, why not add the option to use scrap
armor bits too?