1.Merge branch 'master' into chenxy

Conflicts:
	src/net/yaopao/activity/AboutActivity.java
1.运动记录列表修改支持上拉刷新
2.但是数据是写死的
1.Merge branch 'master' into chenxy

Conflicts:
	gen/net/yaopao/activity/R.java
	res/layout/activity_sport_list.xml
	src/net/yaopao/activity/SportListActivity.java
合并