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!
Small mutations update
Conditionalize yet more of the makefiles.
Mutations jsonized.
Resolved some conflicts

Conflicts:
	game.h
	iuse.cpp
	mutation_data.cpp
Fixed automerge error
Moved categories from mutation_cat.json into mutations.json
Merge branch 'master' of https://github.com/NaturesWitness/Cataclysm-DDA