中介者模式
Merge remote-tracking branch 'origin/master'

Conflicts:
	modules/mediator/pom.xml