Database added killeon correction + some missing npcs
Merge branch 'master' of https://github.com/DarkstarProject/darkstar

Conflicts:
	sql/npc_list.sql