m

m
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/app.iml
	app/src/main/java/sysu/project/lee/sportslife/News/NewsList.java