Changed Java version to 1.6
Merge branch 'master' into question-logic
Field questionId moved up from MultipleChoiceQuestion to AbstractQuestion.
Created class FillInTheBlankQuestion.
FillInTheBlankQuestion passes a JUnit test.
FillInTheBlankQuestion can now separate words before and after the blank.
Created FillInTheBlankPanel which displays before and after text.
Completed task of displaying fill in the blank question.
FillInTheBlankPanel reacts to enter pressed when text field has focus.
FillInTheBlankPanel now indicates (in console) if answer was correct.
Cleaned up code in FillInTheBlankPanel.
Questions can be written to the XML file.
Fixed merge conflicts.