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

This reverts commit b633136d1a48e065ee86f14dbe1a415b4bce59c0.
Rebase from 'upstream'
Trimmed the branch to only the naoqi_tools sub directory