1
Merge branch 'master' of https://github.com/baoth/huwaipingtai

Conflicts:
	IBusinessOrder/bin/Debug/Toolkit.dll
	IBusinessOrder/bin/Debug/Toolkit.pdb
	Toolkit/bin/Debug/Toolkit.dll
	Toolkit/bin/Debug/Toolkit.pdb