Merge branch 'master' into dev_room_chat

# Conflicts:
#	live/src/main/java/com/yunbao/live/activity/PDLIiveChatActivity.java
#	main/src/main/java/com/yunbao/main/manager/imrongcloud/ConversationIMListManager.java

live/src/main/res/drawable/background_system_message.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <corners android:radius="95dp" />
+    <solid android:color="@color/red" />
+    <stroke
+        android:width="1dp"
+        android:color="@color/white" />
+    <padding
+        android:bottom="5dp"
+        android:left="10dp"
+        android:right="10dp"
+        android:top="5dp" />
+</shape>