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

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