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

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