Merge branch 'maxima-survey' of /scratch/wikibrain with conflicts.
fixed the contingency for survey crash
Merge remote-tracking branch 'origin/maxima-survey' into maxima-survey

Conflicts:
	IDsToTitles.txt
	wikibrain-spatial/src/main/java/org/wikibrain/spatial/cookbook/tflevaluate/SimulatedTurkers.java
fixed the contingency for survey crash