Merge branch 'master_umeng'

# Conflicts:
#	app/proguard-rules.pro
#	common/src/main/res/values/strings.xml
#	live/src/main/java/com/yunbao/live/dialog/LiveGiftPopup.java

app/proguard-rules.pro

@@ -236,6 +236,20 @@ rx.internal.util.atomic.LinkedQueueNode* consumerNode;
 -keep class com.faceunity.wrapper.faceunity$LoadConfig*{
    private static boolean sLoadedLibrary;
 }
+-keep class com.umeng.** {*;}
+
+-keep class org.repackage.** {*;}
+
+-keep class com.uyumao.** { *; }
+
+-keepclassmembers class * {
+   public <init> (org.json.JSONObject);
+}
+
+-keepclassmembers enum * {
+    public static **[] values();
+    public static ** valueOf(java.lang.String);
+}
 #----svga
 -keep class com.opensource.svgaplayer.**{
     public <methods>;