fixed npc, added npc_types and the puppy monster type, made addBillboardItemToWorld public
Merge branch 'master' of github.com:PongUIO/ActionCrawl

Conflicts:
	src/gamedefines.h
	src/gameengine.h