bug fix
Merge remote-tracking branch 'origin/master'

Conflicts:
	event-service/src/test/java/com/xingcloud/events/TestEventService.java