nfc fix, still not fully working
Merge branch 'master' of https://github.com/swi88/YourClubMusic
Merge branch 'master' of https://github.com/swi88/YourClubMusic