Merge branch 'master' of github.com:JimWest/ExtraEntitesMod
Merge branch 'master' of github.com:AlexHayton/ExtraEntitesMod
Added default icon texture
Merge branch 'master' of github.com:JimWest/ExtraEntitesMod

Conflicts:
	output/editor_setup.xml
Fixed EEM hooks
Merge branch 'master' of github.com:AlexHayton/ExtraEntitesMod
Added a server-side npc tester
Fixed a rare bug where you kill an npc but youre already dead.
Improvements to lerk poison dart, so you don't take mega damage after they die.
Updated the dialogue logic.