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

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