Merge branch 'master-2' in 'master' to bring it up to date with DDA Mainline

Conflicts:
	CataclysmWin.cbp
	Makefile.Windows
	SIGNOFF
	TRANSLATING.md
	addiction.cpp
	artifact.cpp
	auto_pickup.cpp
	bionics.cpp
	calendar.cpp
	computer.cpp
	construction.cpp
	crafting.cpp
	data/raw/item_groups.json
	data/raw/items/ammo.json
	data/raw/items/armor.json
	data/raw/items/comestibles.json
	data/raw/items/containers.json
	data/raw/items/melee.json
	data/raw/items/ranged.json
	data/raw/professions.json
	data/raw/recipes.json
	disease.cpp
	faction.cpp
	field.cpp
	game.cpp
	game.h
	item.cpp
	item.h
	item_factory.cpp
	itypedef.cpp
	iuse.cpp
	lang/po/cataclysm-dda.pot
	lang/po/de_DE.po
	lang/po/fr_FR.po
	lang/po/pt_PT.po
	lang/po/ru_RU.po
	lang/po/zh_CN.po
	main.cpp
	melee.cpp
	monattack.cpp
	mondeath.cpp
	monmove.cpp
	mutation.cpp
	mutation_data.cpp
	newcharacter.cpp
	npcmove.cpp
	npctalk.cpp
	options.cpp
	options.h
	output.cpp
	output.h
	overmap.cpp
	player.cpp
	player.h
	pldata.h
	profession.cpp
	profession.h
	ranged.cpp
	sdlcurse.cpp
	skill.cpp
	translations.h
	trapfunc.cpp
	veh_interact.cpp
	vehicle.cpp
	weather.cpp
	wincurse.cpp
	wish.cpp