Allow crafting window to make full use of screen height, 'e' will also describe item as per convention
Remove shadowed variables from headers
Un-shadow a member of picojson
Remove some variable shadowing (in files touched by another cleanup branch)
Merge branch 'master' into crafting_ui_tweaks
crafting ui: Fixed erronious commit: lines now display properly and 'e' works
Glass water bottles: volume 2=>3 to match storage volume, weight +1
 (glass is heavy). Canteens: volume 6 => 4. -2 volume is a virtual
 unit to account for ease of handling; 3 500ml water bottles (6 vol)
 are more of a pain to handle and probably occupy more dead space
 packed together, to say nothing about a canteen's strap etc etc.
Move Furniture required strength is now in ter_t

Provide a more appropriate error message if you're not strong enough
Changed failed crafting check
Removed bodytemp calculation skip over mutated bodyparts
Added body temperature effects for disintergration and radioactive mutations
Updated changelog (somewhat vaguely for fun)
Missing ;s
Player generates more heat while awake
Changed cold/hot to chilly/warm to better reflect effects on player
Update changelog
Tweaked hunger and fatigue's contribution to body temperature
Updated update_bodytemp() opening comment to reflect recent changes
Update changelog
Updated itypedef.cpp -- added hats

Added the beret and the pickelhaube. One is for military and fashion spawns, the other for the pawnshop (and maybe one day museums?).