完成了一些方法和页面
Merge branch 'master' into zcrrr
又写了两个界面
合并代码
提交
Merge branch 'master' into zcrrr

Conflicts:
	gen/net/yaopao/activity/R.java
Merge branch 'master' into zcrrr
merge
Merge branch 'master' into zcrrr
1111
2222
完成比赛异常提示layout
合并张弛代码