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

Conflicts:
	csl_shenxin/build.gradle
	csl_shenxin/src/main/AndroidManifest.xml
	csl_shenxin/src/main/java/com/weixuan/shenxin/fragment/ClubTeamCultureFragment.java
	csl_shenxin/src/main/res/layout/f_club_team_culture.xml
	csl_shenxin/src/main/res/values/strings.xml
	gradle/wrapper/gradle-wrapper.properties
	libraries/VitamioLibrary/build.gradle