Music and Controller preferences added
Merge branch 'levelIssue' into develop