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

Conflicts:
	Helper/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	TestConsole/obj/x86/Debug/TestConsole.csproj.FileListAbsolute.txt
q
asdasd