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

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