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
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
Save Traits, Mutations and Mutation category levels by name.
Combined traits.json and mutations.json
uimenu_entry: add optional 'extratxt' variable for secondary text (such as symbol placement)
int entry.left: offset from left edge of main entry text
nc_color entry.color: color of text
std::string txt: the text itself.

For example, see 'editmap' class
Map editor: Move into editmap class, fixed fields, added furniture, added line/rectangle/circle drawing of terrain/fields/traps/etc.

Completely functional, however some UI details may change, in particular switching between shape resizing / movement and tile selection
editmap: fix reversed "J" and "K" movement keys
editmap: adjust help strings
editmap: fix field density hilight offset
Player now searches tiles for warmth while asleep
The player will intelligently use floor items for warmth
Merge branches 'master' and 'sleep-tiles-test' into sleep-tiles-test
Removed uneeded header
Optimizations to warmth while asleep code