extending the support of multiple questionnaires
added logic for serving new questionnaire to people who filled out the old one by October 25th
cleaning up in the data folder
Merge branch 'devel' into multiple_questionnaire_support

* devel:
  added trash back