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

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