Npc training talk fix
Updated credits
Merge pull request #198 from Catacstone/npc_talk_fix

Npc training talk fix
Merge branch 'master' of https://github.com/TheDarklingWolf/Cataclysm-DDA
Sinks no longer count as water sources
Craftable rock pots
Zombies bash curtained windows, waterskins craftable. Text overlap on
stats probably fixed.
Fixed duplicate bashable flag
Fixed an error in waterskin crafting, Reworked some skill costs
Drugdeal generation freeze fix
Change (hot) to (fresh) on newly generated items.
Merge pull request #201 from Catacstone/mxdrugdeal_freeze

Drugdeal generation freeze fix
Moved templates back to data folder.
Having them in the save folder prevented some problems with carrying
over to new versions yes, but it was also incredibly annoying to use
templates if you also wanted to use the 'delete world on save' option.
Merge branch 'master' of https://github.com/TheDarklingWolf/Cataclysm-DDA
Added a changelog
More changelog, updated makefile version number
Added cake, some new weapons, replaced Heartless with cannibal, new
morale penalty for eating human meat.
Fixed cake spawn
Merge remote-tracking branch 'upstream/master' into freq