Merge branch 'master' of https://github.com/GalenEvil/Cataclysm-DDA-1

Conflicts:
	game.cpp
	itype.h
	player.cpp
Alteration of Project file
Merge branch 'master-2'

Conflicts:
	construction.cpp
	crafting.cpp
Bring up to speed with current master repo
Update to CleverRaven Master branch

Conflicts:
	SIGNOFF
	construction.cpp
	crafting.cpp
	data/raw/item_groups.json
	data/raw/items/ammo.json
	data/raw/professions.json
	faction.cpp
	field.cpp
	game.cpp
	game.h
	item.cpp
	itypedef.cpp
	lang/po/cataclysm-dda.pot
	lang/po/fr_FR.po
	lang/po/pt_PT.po
	lang/po/ru_RU.po
	lang/po/zh_CN.po
	newcharacter.cpp
	npctalk.cpp
	output.cpp
	output.h
	player.cpp
	veh_interact.cpp
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.
Adjust makefile for mac-specific ncurses library naming.
Allow disabling gettext dependency.
Remove redundant include of clocale, thanks wito.
Flip NONLOCALIZED define to LOCALIZE, and pass it in to compile jobs.
Merge branch 'master' of https://github.com/NaturesWitness/Cataclysm-DDA
Update calendar.cpp

Make the compiler happy when building with localization disabled.
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA
Further conditioniolize gettext compilation.
Fix a casting warning.
Mutations to json Step 1
Merge branch 'mutations' of https://github.com/OzoneH3/Cataclysm-DDA

Conflicts:
	player.cpp
	weather.cpp
Jsonize Mutations Step2. It runs!