bug fix for study_dir
Merge branch 'master' of git://github.com/qiime/qiime_web_app into otu_fix
Merge branch 'master' of git://github.com/qiime/qiime_web_app into otu_fix
script fix for otu updater
Merge branch 'master' of git://github.com/qiime/qiime_web_app into otu_fix
typo
Merge pull request #244 from douginator2000/otu_fix

Otu fix
Fix survey_main.psp, now imports send_email
Changed except clause back to the way it was
Merge pull request #245 from adamrp/emailing_children

Emailing children
Add default value of receipient
Add e-mail address for participant

This field serves the mechanism that sends an e-mail to the particpants
containing the consent form.
Merge branch 'consent_email' of https://github.com/ElDeveloper/qiime_web_app into consent_email
Fix bug where e-mail was sent to wrong recipient

A new message has been added to confirm that the consent form was
successfully sent.

This should fix #233
Merge branch 'consent_email' of https://github.com/ElDeveloper/qiime_web_app into consent_email
Fixed wrong recipient address
Merge branch 'consent_email' of https://github.com/ElDeveloper/qiime_web_app into consent_email
Fix e-mails not being sent to the right address
Remove TO_EMAIL variable from mail.py
Merge pull request #246 from ElDeveloper/consent_email

Consent email