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

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