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

This reverts commit 060d3cf99e2dafc739bb8f760c5ccd347c6e0a24.
Rebase from 'upstream'
Trimmed the branch to only the scitos_touch sub directory