根据美工意见修改反馈分组评分UI，报名列表UI
Merge remote-tracking branch 'choose_remote_name/master'

Conflicts:
	res/layout/test_chart_fragment.xml
Merge remote-tracking branch 'choose_remote_name/master'
给川哥谢了个查询结果activity