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

Conflicts:
	huwaipingtai.suo
	huwaipingtai/huwaipingtai.csproj
	huwaipingtai/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
1