Handle multiple events and versions of surveys #2888
Also addresses #3536
Merge pull request #78 from NUBIC/task_2888

Handle multiple events and versions of surveys #2888