调整logo的大小
Merge branch 'stcdalyc_development' of https://github.com/iSCAU/iSCAU-Android into xillkey_dev

Conflicts:
	app/src/main/res/layout/schoolactivity_listitem.xml
添加 外卖 地图
合并 Marco 的
添加加载注释
完善外卖,考试安排查询缓存
Merge branch 'macro_dev' into stcdalyc_development