Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Fabrication Skill Recipe adjustments
Broke skill system into trained skills and required skills. Fabrication introduced as test case.
Merge remote-tracking branch 'origin/pr/1' into fabrication_skill

Conflicts:
	data/raw/recipes.json
Fixed indentation and missing braces.
Changed the name from trains_skill to skill_used
Merge remote-tracking branch 'upstream/master'
Simple Scrolling Combat Text animation
Belatedly update coding style.
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA
Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
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.