Change wording of a template
Merge pull request #2262 from dimagi/smiley_text

Change wording of a template
Merge branch 'master' into couchpulse
update couchpulse dashboard to include traceback
Merge branch 'couchpulse' into staging