Merge branch 'master-2'

Conflicts:
	CataclysmWin.cbp
	SIGNOFF
	construction.cpp
	crafting.cpp
	data/raw/items/comestibles.json
	data/raw/items/melee.json
	data/raw/items/ranged.json
	data/raw/professions.json
	data/raw/recipes.json
	field.cpp
	game.cpp
	game.h
	iuse.cpp
	melee.cpp
	monattack.cpp
	monmove.cpp
	newcharacter.cpp
	player.cpp
	ranged.cpp
	ui.cpp
	veh_interact.cpp
Revert "Merge branch 'master-2'"

This reverts commit 9cc0139ed8efe0611cfd050cdb624597e319f893.