Merge branch 'feature' of https://gitlab.com/Arisono/SkWeiChat-Baidu into feature

# Conflicts:
#	WeiChat/version.properties

WeiChat/version.properties

@@ -1,8 +1,5 @@
-#Fri Jan 05 17:41:42 CST 2018
-debugName=396
->>>>>>>=ee498070608d5e9e61ea28c6cea1571216fbad83
-versionName=618
-debugCode=396
-versionCode=157
-=\=\=\=\=\=\=
-<<<<<<<=HEAD
+#Tue Jan 09 12:33:20 CST 2018
+debugName=17
+versionName=611
+debugCode=17
+versionCode=150