Merge pull request #283 from akofink/master

Revert Merge of E734
Missing end in questionnaire model