Merge branch 'master' of github.com:frosh-li/baidu.fm