dsf
Merge branch 'master' of https://github.com/popotans/hjnassist

Conflicts:
	CodeGenerate/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	Helper/bin/Debug/Helper.dll
	Helper/bin/Debug/Helper.pdb
	TestProject1/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	WebApplication1/bin/Helper.dll
ewr