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

This reverts commit f764279d29a36e6fb5288a6c47e153742d7be809.
Rebase from 'upstream' @ version '0.3.0'
Trimmed the branch to only the rocon_concert sub directory