Merge branch 'get-name-fallback' of https://github.com/kevingranade/Cataclysm-DDA into kevingranade-get-name-fallback
Merge branch 'debug-clear-monsters' of https://github.com/BevapDin/Cataclysm-DDA into BevapDin-debug-clear-monsters
Fully finished brewing, adds kegs as furniture

Hopefully this should be the final version of the brewing system, bar
bugfixes if needed.
Kegs act as liquid storage, with a faucet included.
Adds tent_kit to dead-soldier itemgroup

As per http://smf.cataclysmdda.com/index.php?topic=5534.0 , soldiers
might be carrying tents or similar shelter-in-place gear.
Category fix for two recipes.
Better item handling, prevents bugs

Adds NOITEM to kegs and vats, and clears non-brew items while setting
things to brew. Should prevent most bugs, you now pretty much can only
break the brewing cycle if you deliberately try.
Buildable kegs and vats

Might be issues if they're built on top of already existing stuff.
Merge pull request #6376 from Rivet-the-Zombie/recipe-category-fix

Category fix for two recipes.
Only refresh after changing tilesets in the option menu if we're called from in the game. Fixes #6372.
Adds nether spawns to corpse mapextras

Maybe they killed 'em, maybe they're just curious, but either way these
ought to liven up the ol' "free loot" arguments.

This doesn't affect any strings, and it shouldn't break anything.  So it
should be safe to go in, but I wouldn't call this a bugfix.

(Unless you're hooked on mi-go or something.  ;-) )
Merge pull request #6378 from kevingranade/fix-tileset-crash-from-main-menu

Only refresh after changing tilesets in the option menu
Yeast culturing!

Harvesting yeast from vats still scrapped.
Final update to changelog, version fallbacks, motd, and credits before release.
Fix makefile version extraction logic to handle alpha characters.
Removes tacky notice.

This is better in the PR than littering the code.
rename makeshift halberd to makeshift glaive

that thing sure isn't a halberd
update recipe to match name change
Merge SDL2.0 goodness and tile fallbacks.

Conflicts:
	src/options.cpp
Merge pull request #6374 from KA101/tentcheck

Adds tent_kit to dead-soldier itemgroup
Merge the wraith.

Conflicts:
	src/disease.cpp
	src/map.cpp
	src/mapgen.cpp
	src/mapgen_functions.cpp
	src/monattack.cpp
	src/mtype.h
	src/player.cpp