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

Conflicts:
	EMBACore.csproj.user
	obj/Debug/DesignTimeResolveAssemblyReferences.cache
	obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	obj/Debug/EMBACore.csproj.GenerateResource.Cache
	obj/Debug/EMBACore.csprojResolveAssemblyReference.cache
	obj/Debug/EMBACore.dll
	obj/Debug/EMBACore.pdb
	obj/Debug/TempPE/Properties.Resources.Designer.cs.dll