校园活动（修复第二个bug）
Merge branch 'macro_dev' into stcdalyc_development
Merge branch 'xillkey_dev' of https://github.com/iSCAU/iSCAU-Android into stcdalyc_development
命名错误。
增加校园活动的备注。
提示正方错误
Merge branch 'macro_dev' of https://github.com/iSCAU/iSCAU-Android into macro_dev
Merge branch 'xillkey_dev' of https://github.com/iSCAU/iSCAU-Android into macro_dev
修正bug
最后的修改
Merge branch 'macro_dev' of https://github.com/iSCAU/iSCAU-Android into macro_dev

Conflicts:
	app/src/main/res/drawable/icon_setting_selector.xml