Merge remote-tracking branch 'origin/MoreIM' into milk
Merge branch 'milk' into 3_10_demo

Conflicts:
	MicroSite_Web/MicroSite_Web.Publish.xml
	Web/Views/Default/ActivityInfo.cshtml
	Web/Web.Publish.xml
Merge branch 'milk' into 3_10_demo

Conflicts:
	MicroSite_Web/MicroSite_Web.Publish.xml
	Web/Views/Default/ActivityInfo.cshtml
	Web/Web.Publish.xml
Merge branch 'milk' into 3_10_demo

Conflicts:
	MicroSite_Web/MicroSite_Web.Publish.xml
	Web/Views/Default/ActivityInfo.cshtml
	Web/Web.Publish.xml
Merge branch 'milk' into 3_10_demo

Conflicts:
	MicroSite_Web/MicroSite_Web.Publish.xml
	Web/Views/Default/ActivityInfo.cshtml
	Web/Web.Publish.xml
Merge remote-tracking branch 'origin/gmy_xinban' into 3_10_demo
Merge branch 'milk' into 3_10_demo

Conflicts:
	MicroSite_Web/MicroSite_Web.Publish.xml
	Web/Views/Default/ActivityInfo.cshtml
	Web/Web.Publish.xml
add