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

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