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

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