Updated Nao teacher.
Merge commit 'a6db9dcd72c98bb8aa29218c633aed5253f59aff'