Add resources to parents and teachers
Merge commit