Merge remote-tracking branch 'origin/master'

# Conflicts:
#	live/src/main/java/com/yunbao/live/views/LiveRoomViewHolder.java

common/src/main/res/drawable/bg_live_tota.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <corners android:topLeftRadius="12dp" android:topRightRadius="12dp" />
-    <solid android:color="#333333" />
+    <solid android:color="#000" />
 </shape>