Tests For Survey Template
Merge branch 'master' of https://github.com/flavour/eden

Conflicts:
	tests/implementation/resources/base.txt