Added questionnaire version selection
Merge branch 'devel'