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

This reverts commit 6dd2510059ded5691b4caa707c7322620f0e8146.
Rebase from 'upstream'
Trimmed the branch to only the nao_description sub directory