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

# Conflicts:
#	WeiChat/src/main/java/com/xzjmyk/pm/activity/ui/me/MeFragment.java
#	WeiChat/version.properties

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Thu May 10 16:08:39 CST 2018
-debugName=224
+#Fri May 11 08:21:40 CST 2018
+debugName=226
 versionName=629
-debugCode=224
+debugCode=226
 versionCode=169