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
New Hardcore -60 hp chargen trait
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.
Merge remote-tracking branch 'dda/pr/464' into dda-master
Base hardcore trait and slowdown from leg damage on percent of max hp instead of absolute values.
Add a signoff statement to the repository for developers to digitally sign.
Sign contributor statement releasing my contributions under CC-BY-SA.
Set minimum move to 25
Add indoor terrain flag and apply it to appropriate terrain.
Calculate indoor-ness of a square based on terrain flag instead of terrain identity.
Merge pull request #472 from veryinky/minmove25

Set minimum move to 25