Merge branch 'master' of https://github.com/NaturesWitness/Cataclysm-DDA
fix conflicts: Merge commit 'f9073b9' into readline_ish_and_more

Conflicts:
	game.cpp
	iuse.cpp
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.
Adjusted smoke distribution function.
Fire adjustments.

- Reduced smoke by half.
- Flammable terrain no longer has to become an INFERNO just to convert the burning terrain to ashes.
- To grow past "small fire" stage, fire needs to be 1.) uncontained and 2.) either have a lot of fuel, or have nearby fires to help it grow
sync / fix conflicts
Ran map::process_fields_in_submap through astyle
Mutations jsonized.
Resolved some conflicts

Conflicts:
	game.h
	iuse.cpp
	mutation_data.cpp
Fixed automerge error
Added 3-litre jar to the 3-litre jar of kompot recipe.