Update DPMusicController to reflect demo additions
Merge branch 'develop'