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

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