Fixed a bug that caused an error if trying to take a deleted survey
Merge remote-tracking branch 'origin/local-take-survey' into design