Possible fix to focus bug (Issue #9)
Merge branch 'NoJavaFX'

Conflicts:
	src/net/bubbaland/trivia/client/TriviaDialog.java
Fixed bugs with question entry window (Issue #12, Issue #19)

Fixed previous question text not displaying on question conflict dialog.
(Issue #19)
Fixed question overwrite on cancel after canceled conflict dialog.
(Issue #12)
Fixed entered text not appearing after canceling a conflict dialog.