fchanged the payload to Assistmetns log-back to temporarily not incloude sub-object JSON
Fixes formatting of partnershipSpecificData which gets sent to Assistments as escape-quotes JSON
Fixed bugs when no hint is found for a hint request.   Fixed bug about video not being returned
When test user selects parametrized problem, 'shuffled' answer now appears on left instead of the answer from the DB.
Bug fix so that after MPPREturnToHut selects an intervention we successfully show it.

Corrected data upon which mastery heuristic calculates (num problems seen in a topic across sessions added)

Moved update of topicMastery so that when student correct, the model is written at the time of attempt rather than waiting til EndProblem.   We update model at EndProblem only if student was not correct on the problem
Added correct format of partnerSpecificData and added Referer to the assistment user session so that logbacks to assistment are based on the referer URL rather than a URL read from the web.xml
Merge remote-tracking branch 'origin/master'
Added correct format of partnerSpecificData and added Referer to the assistment user session so that logbacks to assistment are based on the referer URL rather than a URL read from the web.xml
Updated the new problem template and fixed the screenshot inserter so that it inserts the image specified in the screenshotURL row of the database.
Merge remote-tracking branch 'origin/master'
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
Changed the parameterization code to work with Tom's new representation of variables.
Added in some fixes to the ScreenShotInserter
Merge remote-tracking branch 'origin/master'

Conflicts:
	woServer/src/edu/umass/ckc/wo/db/ScreenshotInserter.java
Doing a test of pull requests.
Merge pull request #158 from jwnewman/master

Doing a test of pull requests.
Removed some fields from Problem queries
Merge branch 'master' of github.com:marshall62/mathspring
Added support for quickAuth problems so it builds the necesary JSON to send to client