KRACOEUS-6955 : Common Questionnaire core 2
KRACOEUS-6955 : Common Questionnaire core 2 -- fix upon comments
Merge pull request #345 from yyuan1/0624_common_2

KRACOEUS-6955 : Common Questionnaire core 2