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.
Belatedly update coding style.
uimenu: bugfixes and additional helper functions
advanced_inv: remembers sorting and target setting across saves
uistate: saves persistent data to save/uistate.json
string_input_popup: line editing via arrows, optional persistent history backbuffer
* new arguments (str title, int width, str default, str description, str history_id, int maxwidth)
* if unset, max_width = width, or 1024 if width is unset / 0
* ^U clears line
* up arrow pulls up history if history_id is provided
* support for larger block of descriptive text above input

list_items: history for filters persists across saves
uimenu.title sets minimum width
string_input_popup: hitting 'd' in history menu deletes history
uistate.save: only save <= 25 history entries per category
Fix manual merge error
item inscription: enable input history, split description of note
from actual note
inscribe: string_format && constage
Enable input history for graffiti
Adjust makefile for mac-specific ncurses library naming.
Allow disabling gettext dependency.