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

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