Merge branch 'master' into dev_6.5.5_语聊

# Conflicts:
#	Share/src/main/java/com/yunbao/share/ui/InvitePopDialog.java
#	Share/src/main/java/com/yunbao/share/ui/SharePopDialog.java
#	app/proguard-rules.pro
#	app/src/main/AndroidManifest.xml
#	build.gradle
#	common/build.gradle
#	common/src/main/java/com/yunbao/common/utils/JavascriptInterfaceUtils.java
#	common/src/main/java/com/yunbao/common/utils/ToastUtil.java
#	common/src/main/java/com/yunbao/common/utils/WordUtil.java
#	config.gradle

build.gradle

@@ -11,6 +11,7 @@ buildscript {
         maven { url 'https://maven.aliyun.com/repository/google' }
         maven { url 'https://maven.fabric.io/public' }
         maven { url 'https://maven.faceunity.com/repository/maven-public/' }//美颜库
+        maven { url 'https://repo1.maven.org/maven2/' }//埋点
         google()
         mavenCentral()
     }
@@ -41,6 +42,7 @@ allprojects {
         maven { url 'https://maven.fabric.io/public' }
         maven { url 'https://maven.faceunity.com/repository/maven-public/' }//美颜库
         maven { url "https://jitpack.io" }
+        maven { url 'https://repo1.maven.org/maven2/' }//埋点
         google()  // Google's Maven repository
     }
 }