Sửa confict
Merge branch 'master' of https://github.com/ducthinhle92/MusicPlayer-Java-Samsung-2014