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

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