Create the ability to call up an npc dialog within an event
Fix broken MenuConfirm instances in GameState menus

Changes reflect recent modificatons to menus/menus.txt formatting.
Merge pull request #370 from dorkster/bugfixes

Fix broken MenuConfirm instances in GameState menus
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 'upstream/master' into npc_actions

Conflicts:
	src/GameStatePlay.cpp