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

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