changing e-mail from with new template. Also fixing the child care yes/no english version in the en.yml file
fixing merge conflict