Separated phases of matter from materials
Merge remote-tracking branch 'upstream/master' into phases

Conflicts:
	player.cpp
Fixed typo
Fixed crafting of drinks
Fixed bracket issue caused by merge conflict
Merge remote-tracking branch 'upstream/master' into phases

Conflicts:
	player.cpp
Add unique string identifiers to each recipe
Merge branch 'master' into crafting
Add in learn-by-disassembly for recipes

Note: breaks saves and probably templates. Adding more recipes won't break saves, and adding new ways to learn recipes also won't break saves.
Re-enable flashlight recipe autolearn, and make UPS learn-by-disassembly (level 4)
cbp file update for latest pulls
Merge pull request #463 from veryinky/cbpmapgenformat

cbp file update for latest pulls
Merge learning recipes from item disassembly.
New Hardcore -60 hp chargen trait
Added .22 casings
added advinv and recraft to the default keymap file
Fix to hardcore for leg hp & movecost
Merge pull request #466 from ZwodahS/master

added recraft and advinv to default keymap.txt
Merge remote-tracking branch 'dda/pr/425' into dda-master

Conflicts:
	crafting.cpp
Whitespace cleanup.