#430 do not send email when an answer is edited
#429 translations
Merge branch 'danielhers-dev' into dev

Conflicts:
	locale/he/LC_MESSAGES/django.mo
	locale/he/LC_MESSAGES/django.po