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

# Conflicts:
#	WeiChat/version.properties

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Wed Jan 24 18:36:17 CST 2018
-debugName=148
+#Wed Jan 24 19:01:33 CST 2018
+debugName=149
 versionName=613
-debugCode=148
+debugCode=149
 versionCode=152

app_modular/appbooking/src/main/res/layout/header_bservices_grid.xml

@@ -24,7 +24,7 @@
         android:layout_width="match_parent"
         android:layout_marginTop="10dp"
         android:layout_height="100dp"
-        app:banner_default_image="@drawable/skin_icon_blue_circle"
+        app:banner_default_image="@drawable/icon_bservice_banner_deafult"
         app:delay_time="3000"
         app:is_auto_play="true"
         app:layout_collapseMode="none"