Merge branch 'master' of github.com:TheDarklingWolf/Cataclysm-DDA

Conflicts:
	crafting.cpp
Being on fire now increases bodytemp
Frostbite now only occurs in freezing temperatures
Buffed fire's heating capabilities
Standing on a fire or magma tile also heats up player
Standing on fire heats players, if fire is big enough
Merge branch 'master' of github.com:TheDarklingWolf/Cataclysm-DDA
Merge pull request #256 from Shoes01/master

Buffed fire, fixed frostbite occurring in above freezing temps