fixes a 404 that happened when returning from MPP.
committing to merge
Snapshots in MPP now being read from database blobs.
Snapshots in MPP now being read from database blobs.
beginnings of short answer probs
beginnings of short answer probs
short answer probs merged
short answer probs merged
short answer probs merged
test
test
Fixing project files that were changed when pulling from git.
Fixing project files that were changed when pulling from git.
commit for merge
Merge branch 'master' of github.com:marshall62/mathspring

Conflicts:
	.idea/workspace.xml
Repaired missing if statment so that events are handled
Fixes a bug where parametrized problems did not get data when returning from MPP.
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
Fixes a bug where parametrized problems did not get data when returning from MPP.
Committing to merge.