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

Conflicts:
	huwaipingtai.suo
	huwaipingtai/Controllers/GoodsSizeController.cs
	huwaipingtai/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
	huwaipingtai/obj/Debug/huwaipingtai.dll
	huwaipingtai/obj/Debug/huwaipingtai.pdb
1