modify the event email
Merge remote-tracking branch 'origin/chaolun' into chaolun

Conflicts:
	.idea/workspace.xml
ignore .idea