Merge branch 'master' into pausestate
Added pause capability
Merge branch 'pausestate'
Added new music files
Merge remote-tracking branch 'origin/master' into develop