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

# Conflicts:
#	WeiChat/version.properties

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Tue Jan 09 11:48:41 CST 2018
-debugName=16
+#Tue Jan 09 13:53:40 CST 2018
+debugName=18
 versionName=611
-debugCode=16
+debugCode=18
 versionCode=150