Changed short_questionnaire to questionnaire.
Merge branch 'master' of https://github.com/SweetFeedback/SweetRewardCSIE

Conflicts:
	templates/short_quiz.html