解决冲突
Merge branch 'master' of https://github.com/zhjnuacm/sigma-platform.git

Conflicts:
	protected/runtime/application.log