Create the ability to call up an npc dialog within an event
Made some labels more descriptive
Moved some variable to GameStatePlay instead of MapRenderer
Merge pull request #368 from makrohn/eventdialog

Create the ability to call up an npc dialog within an event
Merge remote-tracking branch 'mainline/master'

Conflicts:
	src/GameStatePlay.cpp