Fix parser tests
Merge branch 'master' of https://github.com/samal84/supersurvey

Conflicts:
	test-generator/test-generator.fsproj