Added music and preferences
merge conflict fixes
Merge with master