fix build
Merge branch 'fixbuild' of https://github.com/lucianposton/Cataclysm-DDA into lucianposton-fixbuild
Convert temperature-based diseases over
Merge remote-tracking branch 'i2amroy/Health' into FrankenMod

Conflicts:
	src/disease.cpp
Merge remote-tracking branch 'CleverRaven/master' into FrankenMod