完成比赛结束页面
完成成绩列表页面，修改测试代码
Merge branch 'master' into zcrrr

Conflicts:
	gen/net/yaopao/activity/R.java
Merge branch 'master' into zcrrr