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

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