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

# Conflicts:
#	WeiChat/version.properties

WeiChat/src/main/res/layout/activity_base_info.xml

@@ -134,7 +134,7 @@
                 android:layout_height="48dp"
                 android:layout_marginRight="10dp" 
                 android:layout_centerVertical="true"
-                android:background="@drawable/defaultpic"
+              
                 android:layout_toLeftOf="@+id/me_heard_arrow_img"
                
                 android:textColor="@color/dark_dark_grey" />

WeiChat/version.properties

@@ -1,5 +1,5 @@
-#Fri May 25 16:01:54 CST 2018
-debugName=438
+#Fri May 25 17:40:27 CST 2018
+debugName=446
 versionName=630
-debugCode=438
+debugCode=446
 versionCode=170

app_core/common/src/main/res/layout/activity_customer_list.xml

@@ -108,8 +108,6 @@
 
     <com.handmark.pulltorefresh.library.PullToRefreshListView
         android:id="@+id/list_business"
-        android:layout_marginLeft="10dp"
-        android:layout_marginRight="10dp"
         style="@style/ListViewBasic">
 
     </com.handmark.pulltorefresh.library.PullToRefreshListView>

app_modular/appmusic/src/main/java/com/usoftchina/pay/MainMusicActivity.java

@@ -91,7 +91,7 @@ public class MainMusicActivity extends AppCompatActivity {
 				mPlayBtn.setText("暂停");
 				mPlayBtn.setSelected(true);
 			}
-		},3000);
+		},1000);
 		mPlayBtn = (Button) findViewById(R.id.btnPlay);
 		mPlayerSeekBar.setOnSeekBarChangeListener(onSeekBarChangeListener);
 		mPlayBtn.setOnClickListener(onClickListener);