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

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