Bugfix for hot foods in containers not cooling down.  Fixes #336
Rebuilds outside cache only
merge master
Added M72-LAW. Placed it in the Soldier & Helicopter Mapextras, and the launcher spawnlist.
Merge branch 'master' of https://github.com/TheDarklingWolf/Cataclysm-DDA
revert merge straggler
merge stragglers
My LAW goes FWOOSH! Added changes to changelog.
Merge branch 'master' of git://github.com/TheDarklingWolf/Cataclysm-DDA
Merge github.com:TheDarklingWolf/Cataclysm-DDA
Renamed silencer to suppressor.
Change code references for silencer to suppressor to match ingame name.
Actually changed all references of Silencer to Suppressor
Merge branch 'master' of git://github.com/TheDarklingWolf/Cataclysm-DDA
Merge remote-tracking branch 'dda/pr/347' into dda-master
Remove a ton of commented-out code.
Kill trailing whitespace\!
Merge branch 'master' of git://github.com/TheDarklingWolf/Cataclysm-DDA
Woodstove construction
Merge pull request #360 from veryinky/master

Woodstoves related changes + metal tank crafting.