检查汇总日志
Merge remote-tracking branch 'origin/master' into chmod777

Conflicts:
	upgrade/.settings/org.eclipse.core.resources.prefs