ent
Merge branch 'master' of https://github.com/NiallTsao/YH_MP

Conflicts:
	YH_Marketplace.xcodeproj/project.pbxproj

YH_Marketplace.xcodeproj/project.xcworkspace/xcuserdata/liuxiangchao.xcu
serdatad/UserInterfaceState.xcuserstate
	YH_Marketplace/Views/iPhone/Mine/YH_ImageCropViewController_iPhone.m
	YH_Marketplace/Views/iPhone/Mine/YH_MeViewController_iPhone.m
	YH_Marketplace/Views/iPhone/Mine/YH_PublishViewController_iPhone.m