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

Conflicts:
	obj/Debug/DesignTimeResolveAssemblyReferences.cache
	obj/Debug/TempPE/Properties.Resources.Designer.cs.dll