Revert "Trimmed the branch to only the nao_robot sub directory"

This reverts commit 02cd7040549338ffad59a422fc1e6a2fa7b754f3.
Rebase from 'upstream'
Trimmed the branch to only the nao_robot sub directory