Merge remote-tracking branch 'daohoangson/zing-mp3'