Add smart tip selection based on answers to questionnaire, and put in special case code for demo survey account
Merge remote-tracking branch 'origin/master'