Merge remote-tracking branch 'origin/master' into baotou_medical_school

# Conflicts:
#	app/build.gradle
#	app/src/main/java/xn/hxp/ui/MainActivity.java