added logging when generating JSP.   Fixed bug in student model endProblem so it doesn't put negative numbers for totalHintTime
Merge branch 'master' of github.com:marshall62/mathspring
Added in some fixes to the ScreenShotInserter
Merge remote-tracking branch 'origin/master'

Conflicts:
	woServer/src/edu/umass/ckc/wo/db/ScreenshotInserter.java
Removed some fields from Problem queries
Merge branch 'master' of github.com:marshall62/mathspring