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

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