Merge branch 'master' of git://github.com/menxu/small-team-km-android-client
Merge branch 'master' of git://github.com/menxu/small-team-km-android-client
简单重构
和 音乐
Merge branch 'master' of git://github.com/arlyxiao/small-team-km-android-client
音乐和条码信息显示