Sad face Danny translations
Merge branch 'commtrack-makethehurtingstop' into commtrack_translations

Conflicts:
	locale/fra/LC_MESSAGES/django.mo
	locale/fra/LC_MESSAGES/django.po
Bump .po file
Merge pull request #2304 from dimagi/commtrack_translations

Sad face Danny translations