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.
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.
WinGDI: Load all fonts from font folder
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