Object, Npc, Dialog
Merge branch 'master' of https://github.com/hoshi89/Forgotten

Conflicts:
	Forgotten/Forgotten/Entity.h