survey
mergin in dans changes

Merge branch 'master' of https://github.com/sociam/lying-survey