Merge pull request #5862 from origamiwolf/mapgen-special-doc

json mapgen place special documentation
increased frequency of zombie packs
Merge branch 'ad_inv' of https://github.com/illi-kun/Cataclysm-DDA into illi-kun-ad_inv
rechargeable battery mod recipe tweak
Merge branch 'master' of https://github.com/aapo/Cataclysm-DDA into aapo-master

Conflicts:
	src/help.cpp

Removed help.cpp code as obsolete.  Sorry, aapo.
Merge pull request #5889 from BevapDin/remov-double-translation

remove double translation of terrain and furniture names
Merge pull request #5866 from illi-kun/patch-1

Update Cataclysm.vcxproj.filters
Merge branch 'faucet' of https://github.com/9600bauds/Cataclysm-DDA into 9600bauds-faucet

Conflicts:
	data/json/recipes/recipes.json
	src/game.cpp
Merge Adv inventory pane management fix.
Merge pull request #5895 from Rivet-the-Zombie/antiparasitic

Adds antiparasitic drug.
Conflicts:
	data/json/item_groups.json
	data/json/recipes/recipes.json
map specials now spawn zombies