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

Conflicts:
	Common/obj/Debug/Common.dll
	Common/obj/Debug/Common.pdb
	DataModel/obj/Debug/DataModel.dll
	DataModel/obj/Debug/DataModel.pdb