Text changes to email and thank you page.
Merge branch 'master' of https://github.com/MayOneUS/app-engine

Conflicts:
	backend/email/thank-you.html
	backend/email/thank-you.txt