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

This reverts commit 50713859ad5b59444f1e3f591c2962ca230a7132.
Rebase from 'upstream'
Trimmed the branch to only the rocon_qt_gui sub directory