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

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