Updated Conversation classes.  These still need to be cleaned up though.
Merge origin/master

Conflicts:
	src/svugame/Overworld.java