SCREEN-66 设置快捷键时添加取消按钮
SCREEN-67 增加上传后播放音乐的设置
Merge remote-tracking branch 'origin/master'