Merge branch 'smiley' into smiley_emails
support monthly scheduled reports
Merge branch 'master' into monthly-after
split out js into separate file
Email sending basically in place
Merge remote-tracking branch 'origin/master' into smiley_emails
turn off celery task temporarily
Tag incoming verification message with contact's doc type and id
Set recipient doc_type correctly
no django0 and 1
Merge pull request #1569 from dimagi/nodjango01

no django0 and 1
fixing pact query issue
fixing pillowstate active pillows ref
Migration script for recipient doc_type
Include domain
null out both recipient fields
Merge pull request #1570 from dimagi/sms-data-element-fixes

Sms data element fixes
change total column calculations
[django 1.5] use a default (bad) secret key
Merge pull request #1572 from dimagi/secret-key

[django 1.5] use a default (bad) secret key