sync
Merge branch 'master' of https://github.com/zhjnuacm/sigma-platform.git

Conflicts:
	client/src/core/Mediator.js