Merge remote-tracking branch 'origin/master'
After merge. fixed a red squiggly in PlayQuiz.jsp.  commented out a
couple red squigglies in AccountManagerTests.java