bumped version to 0.2.0-devel
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
added trash back
Merge branch 'devel' into multiple_questionnaire_support

* devel:
  added trash back
bumped version to 0.3.0
Merge branch 'master' into production_sensibledtu1k

* master:
  bumped version to 0.3.0
  added trash back
  cleaning up in the data folder
  added logic for serving new questionnaire to people who filled out the old one by October 25th
  extending the support of multiple questionnaires
  bumped version to 0.2.0-devel