Add SurveyDict test.
Merge remote-tracking branch 'origin/master' into add_test
Merge remote-tracking branch 'origin/master' into atdyer-add_test

Conflicts:
	survey.py