Fixed typo causing crash in Bhaflau_Thickets/npcs/Daswil.lua
June update to stackable items part 1, ores and logs. Working on the rest in diff branch right now.
Merge pull request #360 from TeoTwawki/misc

Fixed typo causing crash in Bhaflau_Thickets/npcs/Daswil.lua
Merge pull request #361 from TeoTwawki/stackable-item-updates-1-(ore,-logs)

June update to stackable items part 1, ores and logs.
Merge branch 'master' of https://github.com/DarkstarProject/darkstar into stackable-item-updates-2-(everything-else)

Resolved Conflicts:
	sql/item_basic.sql