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

Conflicts:
	BusinessOrder/bin/Debug/Common.dll
	BusinessOrder/bin/Debug/Common.pdb
	Common/bin/Debug/Common.dll
	Common/bin/Debug/Common.pdb