Merge branch 'smiley' into smiley_emails
Email sending basically in place
Merge remote-tracking branch 'origin/master' into smiley_emails
turn off celery task temporarily
Better handle inconsistent form data
Minor code clean-up
Add secret_game result to total games played
update README
Merge pull request #1614 from dimagi/smiley_emails

Smiley Report updates