Merge branch 'develop', remote-tracking branch 'origin' into develop
Merge pull request #23 from soundsplosion/jy

Allow Rhombus to play tracks in track page
Add Rhombus music player to competition page