Update activation_email_subject.txt
Update activation_email.txt
Update activation_complete.html
merging conflicts
Merge pull request #364 from kobotoolbox/tp944

Tp944