2
Merge remote-tracking branch 'KeWeiOMS/jmyd' into ttt

Conflicts:
	KeWeiOMS.Web/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	KeWeiOMS.v11.suo