Merge branch 'automated-sign-up'

Conflicts:
	sandy-disaster-recovery/email_templates/new_organization.body.txt