Merge branch 'master' into question-type-fixes
Removed extra line from add_quiz_question.jsp
Merge pull request #36 from kmblake/question-type-fixes

Question type fixes