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

Conflicts:
	huwaipingtai/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
1
Merge branch 'master' of https://github.com/baoth/huwaipingtai

Conflicts:
	huwaipingtai/bin/huwaipingtai.dll
	huwaipingtai/bin/huwaipingtai.pdb