Merge remote-tracking branch 'origin/musicPlayer' into musicPlayer
Merge branch 'musicPlayer' of https://github.com/cRiMi/Thea-Explorer into musicPlayer