new test
Merge branch 'master' of https://github.com/sf71316/General

Conflicts:
	General.Service/bin/Debug/General.Service.dll
	General.Service/bin/Debug/General.Service.pdb
	General.Service/obj/Debug/General.Service.dll
	General.Service/obj/Debug/General.Service.pdb