Merge branch 'master' into pdlive_samsung

# Conflicts:
#	config.gradle
#	live/src/main/java/com/yunbao/live/views/SystemMessageViewHolder.java

common/build.gradle

@@ -191,7 +191,7 @@ dependencies {
     api 'com.github.princekin-f:EasyFloat:2.0.4'
     api files('libs/Msc.jar')
 
-    api 'com.github.li-xiaojun:XPopup:2.9.1'
+    api 'com.github.li-xiaojun:XPopup:2.10.0'
 
     api 'com.github.shenbengit:PagerGridLayoutManager:1.1.7'
     //选择器
@@ -209,6 +209,8 @@ dependencies {
 
     // 多语言语音识别扩展库(可选)
     api 'tech.sud.mgp:SudASR:1.3.3.1158'
+    //侧滑删除
+    api 'com.yanzhenjie.recyclerview:x:1.3.2'
 
     //华为支付插件包
     //api project(':lib_huawei')