no message
Merge branch 'master' of https://github.com/jungfengpaulwang/EMBAUIOrder

Conflicts:
	obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	obj/x86/Debug/UIOrder.csproj.GenerateResource.Cache
	obj/x86/Debug/UIOrder.dll
	obj/x86/Debug/UIOrder.pdb