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

This reverts commit b6b24611128f5c5a618c9633157ea49be35e149e.
Rebase from 'upstream'
Trimmed the branch to only the nao_apps sub directory