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

This reverts commit 47fce5529704b5b340ffd04dddee95bb4c1c820e.
Rebase from 'upstream'
Trimmed the branch to only the rocon_concert sub directory