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

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