update  12.24
Merge remote-tracking branch 'origin/master'

Conflicts:
	csl_shenxin/build.gradle
	csl_shenxin/src/main/java/com/vxfc/shenxin/ui/WelcomeActivity.java
	csl_shenxin/src/main/java/com/weixuan/shenxin/fragment/ClubBusinessFragment.java
	csl_shenxin/src/main/java/com/weixuan/shenxin/fragment/ClubTeamCultureFragment.java
	csl_shenxin/src/main/java/com/weixuan/shenxin/test/Test.java
	csl_shenxin/src/main/res/layout/f_club_team_culture.xml
	csl_shenxin/src/main/res/values/dimens.xml