Updated version of the questionnaire (and associated DB items)
Merge remote-tracking branch 'origin/master'