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

This reverts commit 5110dd46ce6172aeb35838b55d171d4e789509fb.
Rebase from 'upstream' (no changes)
Trimmed the branch to only the naoqi_tools sub directory